Merge pull request #16324 from brave/cr110

Upgrade from Chromium 109 to Chromium 110
brave · Jan 26, 2023 · 98d99f0 · 98d99f0
2 parents 239bc40 + 68ab8fb
commit 98d99f0
Show file tree

Hide file tree

Showing 519 changed files with 3,841 additions and 2,519 deletions.
diff --git a/.storybook/BUILD.gn b/.storybook/BUILD.gn
@@ -21,7 +21,6 @@ group("storybook") {
     "//brave/components/brave_wallet/common:mojom_js",
     "//mojo/public/js:bindings",
     "//mojo/public/js:resources",
-    "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:preprocess",
   ]
 

diff --git a/android/android_browser_tests.gni b/android/android_browser_tests.gni
@@ -122,6 +122,7 @@ android_test_exception_deps = [
   "//brave/browser/farbling:browser_tests",
   "//brave/browser/net:browser_tests",
   "//brave/browser/permissions:browser_tests",
+  "//brave/browser/playlist/test:browser_tests",
   "//brave/browser/test:browser_tests",
   "//brave/browser/ui:browser_tests",
   "//brave/browser/ui/tabs/test:browser_tests",

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -642,15 +642,13 @@
 }
 
 -keep class org.chromium.chrome.browser.logo.LogoCoordinator {
-    *** mShouldShowLogo;
+    *** mLogoModel;
     public <init>(...);
-    *** updateVisibility(...);
 }
 
 -keep class org.chromium.chrome.browser.logo.BraveLogoCoordinator {
-    *** mShouldShowLogo;
+    *** mLogoModel;
     public <init>(...);
-    *** updateVisibility(...);
 }
 
 

diff --git a/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java b/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java
@@ -33,7 +33,7 @@ public SplitCompatJobIntentService(String serviceClassName, String splitName) {
     @Override
     protected void attachBaseContext(Context context) {
         // Make sure specified split is installed, otherwise fall back to chrome split.
-        if (mSplitName != null && BundleUtils.isIsolatedSplitInstalled(context, mSplitName)) {
+        if (mSplitName != null && BundleUtils.isIsolatedSplitInstalled(mSplitName)) {
             context = BundleUtils.createIsolatedSplitContext(context, mSplitName);
         } else {
             context = SplitCompatApplication.createChromeContext(context);

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java
@@ -5,11 +5,10 @@
 
 package org.chromium.chrome.browser.crypto_wallet.util;
 
-import org.chromium.base.Predicate;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 
 public class JavaUtils {
     public static <T> List<T> safeVal(List<T> list) {

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
@@ -62,7 +62,6 @@
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
-import org.chromium.base.Predicate;
 import org.chromium.brave_wallet.mojom.AccountInfo;
 import org.chromium.brave_wallet.mojom.AssetPriceTimeframe;
 import org.chromium.brave_wallet.mojom.AssetRatioService;
@@ -127,6 +126,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Predicate;
 
 public class Utils {
     public static int ONBOARDING_FIRST_PAGE_ACTION = 1;

diff --git a/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java b/android/java/org/chromium/chrome/browser/download/settings/BraveDownloadSettings.java
@@ -20,8 +20,6 @@ public class BraveDownloadSettings
         extends DownloadSettings implements Preference.OnPreferenceChangeListener {
     private static final String PREF_AUTOMATICALLY_OPEN_WHEN_POSSIBLE =
             "automatically_open_when_possible";
-    private static final String PREF_DOWNLOAD_LATER_PROMPT_ENABLED =
-            "download_later_prompt_enabled";
     public static final String PREF_LOCATION_PROMPT_ENABLED = "location_prompt_enabled";
     private static final String PREF_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE =
             "download_progress_notification_bubble";
@@ -49,14 +47,6 @@ public void onCreate(Bundle savedInstanceState) {
             locationPromptEnabledPref.setTitle(
                     R.string.brave_download_location_prompt_enabled_title);
         }
-
-        ChromeSwitchPreference downloadLaterPromptEnabledPref =
-                (ChromeSwitchPreference) findPreference(PREF_DOWNLOAD_LATER_PROMPT_ENABLED);
-        assert downloadLaterPromptEnabledPref != null : "Upstream applied new changes!";
-
-        if (downloadLaterPromptEnabledPref != null) {
-            getPreferenceScreen().removePreference(downloadLaterPromptEnabledPref);
-        }
     }
 
     @Override

diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java
@@ -13,7 +13,6 @@
 
 import org.chromium.base.Callback;
 import org.chromium.base.jank_tracker.JankTracker;
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.back_press.BackPressManager;
@@ -36,6 +35,8 @@
 import org.chromium.ui.base.WindowDelegate;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 
+import java.util.function.BooleanSupplier;
+
 public class BraveLocationBarCoordinator extends LocationBarCoordinator {
     private LocationBarMediator mLocationBarMediator;
     private View mQRButton;

diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java
@@ -15,7 +15,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.chromium.base.BraveReflectionUtil;
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.OneshotSupplierImpl;
@@ -30,6 +29,8 @@
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.permissions.PermissionCallback;
 
+import java.util.function.BooleanSupplier;
+
 public class BraveLocationBarMediator extends LocationBarMediator {
     private WindowAndroid mWindowAndroid;
     private LocationBarLayout mLocationBarLayout;

diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -15,7 +15,6 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
 import org.chromium.base.jank_tracker.JankTracker;
@@ -292,8 +291,7 @@ public void initializeWithNative(LayoutManagerImpl layoutManager,
                             newTabClickHandler, mWindowAndroid, mTabCountProvider,
                             mIncognitoStateProvider, mActivity.findViewById(R.id.control_container),
                             closeAllTabsAction);
-            ApiCompatibilityUtils.setAccessibilityTraversalBefore(
-                    mLocationBar.getContainerView(), R.id.bottom_toolbar);
+            mLocationBar.getContainerView().setAccessibilityTraversalBefore(R.id.bottom_toolbar);
         }
     }
 

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java
@@ -7,9 +7,10 @@
 
 import android.view.ViewStub;
 
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
 
+import java.util.function.BooleanSupplier;
+
 class BraveTabSwitcherModeTTCoordinator extends TabSwitcherModeTTCoordinator {
     private TabSwitcherModeTopToolbar mActiveTabSwitcherToolbar;
 

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
@@ -57,7 +57,6 @@
 import org.chromium.base.Log;
 import org.chromium.base.MathUtils;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.PostTask;
@@ -154,6 +153,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.function.BooleanSupplier;
 
 public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
         implements BraveToolbarLayout, OnClickListener, View.OnLongClickListener,

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java
@@ -10,7 +10,6 @@
 import android.view.ViewStub;
 
 import org.chromium.base.Callback;
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
@@ -37,6 +36,7 @@
 import org.chromium.ui.resources.ResourceManager;
 
 import java.util.List;
+import java.util.function.BooleanSupplier;
 
 public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
     private TabSwitcherModeTTCoordinator mTabSwitcherModeCoordinator;

diff --git a/...owser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java b/...owser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java
@@ -29,7 +29,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import org.chromium.base.Consumer;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.chrome.R;
@@ -61,6 +60,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 public class QuickActionSearchAndBookmarkWidgetProvider extends AppWidgetProvider {
     static class QuickActionSearchAndBookmarkWidgetProviderDelegate

diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -27,11 +27,11 @@
 
 import org.chromium.base.Callback;
 import org.chromium.base.jank_tracker.JankTracker;
-import org.chromium.base.supplier.BooleanSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
+import org.chromium.base.test.util.Batch;
 import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.back_press.BackPressManager;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer;
@@ -49,6 +49,7 @@
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+import org.chromium.chrome.browser.logo.LogoCoordinator;
 import org.chromium.chrome.browser.logo.LogoView;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
@@ -104,6 +105,7 @@
 import org.chromium.components.browser_ui.site_settings.ContentSettingException;
 import org.chromium.components.browser_ui.site_settings.PermissionInfo;
 import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
+import org.chromium.components.browser_ui.site_settings.SiteSettingsDelegate;
 import org.chromium.components.browser_ui.site_settings.Website;
 import org.chromium.components.browser_ui.site_settings.WebsiteAddress;
 import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
@@ -125,12 +127,14 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
+import java.util.function.BooleanSupplier;
 
 /**
  * Tests to check whether classes, methods and fields exist for bytecode manipulation.
  * See classes from 'brave/build/android/bytecode/java/org/brave/bytecode' folder.
  * Classes, methods and fields should be whitelisted in 'brave/android/java/apk_for_test.flags'.
  */
+@Batch(Batch.PER_CLASS)
 @RunWith(ChromeJUnit4ClassRunner.class)
 public class BytecodeTest {
     @Test
@@ -395,9 +399,6 @@ public void testMethodsExist() throws Exception {
         Assert.assertTrue(methodExists(
                 "org/chromium/components/browser_ui/site_settings/SingleCategorySettings",
                 "resetList", false, null));
-        Assert.assertTrue(methodExists(
-                "org/chromium/components/browser_ui/site_settings/ContentSettingsResources",
-                "getResourceItem", false, null));
         Assert.assertTrue(methodExists(
                 "org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings",
                 "getPreferenceKey", false, null));
@@ -456,8 +457,6 @@ public void testMethodsExist() throws Exception {
                 "isJavascriptSchemeOrInvalidUrl", true, boolean.class, String.class));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/IntentHandler",
                 "extractUrlFromIntent", true, String.class, Intent.class));
-        Assert.assertTrue(methodExists("org/chromium/chrome/browser/logo/LogoCoordinator",
-                "updateVisibility", true, void.class));
         Assert.assertTrue(methodExists(
                 "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider",
                 "setWidgetEnabled", false, null));
@@ -492,13 +491,13 @@ public void testMethodsForInvocationExist() throws Exception {
                 "getResourceItem", true,
                 getClassForPath(
                         "org/chromium/components/browser_ui/site_settings/ContentSettingsResources$ResourceItem"),
-                int.class));
+                int.class, SiteSettingsDelegate.class));
         Assert.assertTrue(methodExists(
                 "org/chromium/components/browser_ui/site_settings/ContentSettingsResources",
                 "getResourceItem", true,
                 getClassForPath(
                         "org/chromium/components/browser_ui/site_settings/ContentSettingsResources$ResourceItem"),
-                int.class));
+                int.class, SiteSettingsDelegate.class));
         Assert.assertTrue(methodExists(
                 "org/chromium/components/browser_ui/site_settings/SingleCategorySettings",
                 "getAddExceptionDialogMessage", true, String.class));
@@ -727,7 +726,7 @@ public void testConstructorsExistAndMatch() throws Exception {
         Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/logo/LogoCoordinator",
                 "org/chromium/chrome/browser/logo/BraveLogoCoordinator", Context.class,
                 Callback.class, LogoView.class, boolean.class, Callback.class, Runnable.class,
-                boolean.class));
+                boolean.class, LogoCoordinator.VisibilityObserver.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/notifications/permissions/NotificationPermissionRationaleDialogController",
                 "org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController",
@@ -923,7 +922,7 @@ public void testFieldsExist() throws Exception {
         Assert.assertTrue(fieldExists("org/chromium/chrome/browser/omnibox/LocationBarMediator",
                 "mAssistantVoiceSearchServiceSupplier"));
         Assert.assertTrue(
-                fieldExists("org/chromium/chrome/browser/logo/LogoCoordinator", "mShouldShowLogo"));
+                fieldExists("org/chromium/chrome/browser/logo/LogoCoordinator", "mLogoModel"));
     }
 
     @Test

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -144,3 +144,15 @@ void BraveMainDelegate::PreSandboxStartup() {
     brave::InitializeResourceBundle();
   }
 }
+
+absl::optional<int> BraveMainDelegate::PostEarlyInitialization(
+    ChromeMainDelegate::InvokedIn invoked_in) {
+  auto result = ChromeMainDelegate::PostEarlyInitialization(invoked_in);
+  BraveCommandLineHelper command_line(base::CommandLine::ForCurrentProcess());
+  std::string update_url = GetUpdateURLHost();
+  if (!update_url.empty()) {
+    std::string source = "url-source=" + update_url;
+    command_line.AppendSwitchASCII(switches::kComponentUpdater, source.c_str());
+  }
+  return result;
+}
diff --git a/app/brave_main_delegate.h b/app/brave_main_delegate.h
@@ -6,8 +6,6 @@
 #ifndef BRAVE_APP_BRAVE_MAIN_DELEGATE_H_
 #define BRAVE_APP_BRAVE_MAIN_DELEGATE_H_
 
-#include <string>
-
 #include "build/build_config.h"
 #include "chrome/app/chrome_main_delegate.h"
 
@@ -29,6 +27,8 @@ class BraveMainDelegate : public ChromeMainDelegate {
   content::ContentRendererClient* CreateContentRendererClient() override;
   content::ContentUtilityClient* CreateContentUtilityClient() override;
   void PreSandboxStartup() override;
+  absl::optional<int> PostEarlyInitialization(
+      ChromeMainDelegate::InvokedIn invoked_in) override;
 };
 
 #endif  // BRAVE_APP_BRAVE_MAIN_DELEGATE_H_