Upgrade from Chromium 105 to Chromium 106

BUILD.gn

@@ -5,12 +5,16 @@ import("//build/config/locales.gni")
 import("//build/config/zip.gni")
 import("//build/util/process_version.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/cdm/library_cdm/cdm_paths.gni")
+import("//media/media_options.gni")
 import("//third_party/icu/config.gni")
 import("//tools/grit/repack.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//ui/base/ui_features.gni")
 
+if (enable_library_cdms) {
+  import("//media/cdm/library_cdm/cdm_paths.gni")
+}
+
 if (!is_ios) {
   import("//brave/brave_paks.gni")
 }

android/brave_java_sources.gni

@@ -346,6 +346,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java",
   "../../brave/android/java/org/chromium/chrome/browser/util/BraveConstants.java",
   "../../brave/android/java/org/chromium/chrome/browser/util/BraveDbUtil.java",
+  "../../brave/android/java/org/chromium/chrome/browser/util/BraveDynamicColors.java",
   "../../brave/android/java/org/chromium/chrome/browser/util/ConfigurationUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/util/ImageUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/util/LiveDataUtil.java",

android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java

@@ -15,6 +15,7 @@
 import androidx.annotation.NonNull;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.Callback;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
@@ -85,8 +86,9 @@ public BraveTabGroupUiCoordinator(@NonNull Activity activity, @NonNull ViewGroup
 
     @Override
     public void initializeWithNative(Activity activity,
-            BottomControlsCoordinator.BottomControlsVisibilityController visibilityController) {
-        super.initializeWithNative(activity, visibilityController);
+            BottomControlsCoordinator.BottomControlsVisibilityController visibilityController,
+            Callback<Object> onModelTokenChange) {
+        super.initializeWithNative(activity, visibilityController, onModelTokenChange);
 
         mIncognitoStateObserver = (isIncognito) -> {
             if (!isIncognito) {

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -1610,12 +1610,6 @@ public void initializeCompositor() {
                 ContextUtils.getApplicationContext());
     }
 
-    @Override
-    protected boolean supportsDynamicColors() {
-        // Dynamic colors cause styling issues with Brave theme.
-        return false;
-    }
-
     private void InitBraveWalletService() {
         if (mBraveWalletService != null) {
             return;

android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveEthereumPermissionPromptDialog.java

@@ -96,6 +96,9 @@ public BraveEthereumPermissionPromptDialog(long nativeDialogController,
         }
     }
 
+    // TODO: It is much more efficient to retrieve resources by identifier (e.g. R.foo.bar) than by
+    // name (e.g. getIdentifier("bar", "foo", null)).
+    @SuppressLint("DiscouragedApi")
     @CalledByNative
     void show() {
         View customView = LayoutInflaterUtils.inflate(

android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java

@@ -38,10 +38,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
-
-    @Override
-    protected boolean supportsDynamicColors() {
-        // Dynamic colors cause styling issues with Brave theme.
-        return false;
-    }
 }

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -236,7 +236,7 @@ public void enableBottomControls() {
                     mActivity, mWindowAndroid, mLayoutManager,
                     mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
                     mFullscreenManager, mBottomControls, mTabGroupUi,
-                    mOverlayPanelVisibilitySupplier));
+                    mOverlayPanelVisibilitySupplier, getConstraintsProxy()));
             mBottomControls.setBottomControlsCoordinatorSupplier(
                     mBottomControlsCoordinatorSupplier);
             updateBottomToolbarVisibility();
@@ -345,4 +345,13 @@ private boolean isToolbarPhone() {
         return mToolbar instanceof BraveTopToolbarCoordinator
                 && ((BraveTopToolbarCoordinator) mToolbar).isToolbarPhone();
     }
+
+    private ObservableSupplier<Integer> getConstraintsProxy() {
+        if (mToolbar instanceof BraveTopToolbarCoordinator) {
+            return ((BraveTopToolbarCoordinator) mToolbar).getConstraintsProxy();
+        }
+
+        assert false : "Wrong top toolbar type!";
+        return null;
+    }
 }

android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java

@@ -62,9 +62,11 @@ public BraveBottomControlsCoordinator(
             ResourceManager resourceManager, BrowserControlsSizer controlsSizer,
             FullscreenManager fullscreenManager, ScrollingBottomViewResourceFrameLayout root,
             BottomControlsContentDelegate contentDelegate,
-            ObservableSupplier<Boolean> overlayPanelVisibilitySupplier) {
+            ObservableSupplier<Boolean> overlayPanelVisibilitySupplier,
+            ObservableSupplier<Integer> constraintsSupplier) {
         super(activity, windowAndroid, layoutManager, resourceManager, controlsSizer,
-                fullscreenManager, root, contentDelegate, overlayPanelVisibilitySupplier);
+                fullscreenManager, root, contentDelegate, overlayPanelVisibilitySupplier,
+                constraintsSupplier);
 
         mTabSwitcherLongclickListener = tabSwitcherLongclickListener;
         mTabProvider = tabProvider;

android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java

@@ -42,6 +42,7 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
     private ToolbarLayout mBraveToolbarLayout;
     private MenuButtonCoordinator mBraveMenuButtonCoordinator;
     private boolean mIsBottomToolbarVisible;
+    private ObservableSupplier<Integer> mConstraintsProxy;
 
     public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             ViewStub toolbarStub, ViewStub fullscreenToolbarStub, ToolbarLayout toolbarLayout,
@@ -65,7 +66,9 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
             HistoryDelegate historyDelegate, BooleanSupplier partnerHomepageEnabledSupplier,
             OfflineDownloader offlineDownloader, boolean initializeWithIncognitoColors,
             ObservableSupplier<Profile> profileSupplier,
-            Callback<LoadUrlParams> startSurfaceLogoClickedCallback) {
+            Callback<LoadUrlParams> startSurfaceLogoClickedCallback,
+            boolean isStartSurfaceRefactorEnabled,
+            ObservableSupplier<Integer> constraintsSupplier) {
         super(controlContainer, toolbarStub, fullscreenToolbarStub, toolbarLayout,
                 toolbarDataProvider, tabController, userEducationHelper, buttonDataProviders,
                 layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider,
@@ -77,10 +80,12 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
                 isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
                 isTabGroupsAndroidContinuationEnabled, historyDelegate,
                 partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors,
-                profileSupplier, startSurfaceLogoClickedCallback);
+                profileSupplier, startSurfaceLogoClickedCallback, isStartSurfaceRefactorEnabled,
+                constraintsSupplier);
 
         mBraveToolbarLayout = toolbarLayout;
         mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator;
+        mConstraintsProxy = constraintsSupplier;
 
         if (isToolbarPhone()) {
             if (!isStartSurfaceEnabled) {
@@ -115,4 +120,8 @@ public MenuButton getMenuButtonWrapper() {
         // We consider that there is no top toolbar menu button, if bottom toolbar is visible.
         return mIsBottomToolbarVisible ? null : mBraveMenuButtonCoordinator.getMenuButton();
     }
+
+    public ObservableSupplier<Integer> getConstraintsProxy() {
+        return mConstraintsProxy;
+    }
 }

android/java/org/chromium/chrome/browser/util/BraveDynamicColors.java

@@ -0,0 +1,21 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.util;
+
+import android.app.Activity;
+
+import com.google.android.material.color.DynamicColorsOptions;
+
+public class BraveDynamicColors {
+    public static void applyToActivityIfAvailable(Activity activity) {
+        // We disable dynamic colors as it causes styling issues with Brave theme.
+    }
+
+    public static void applyToActivityIfAvailable(
+            Activity activity, DynamicColorsOptions dynamicColorsOptions) {
+        // We disable dynamic colors as it causes styling issues with Brave theme.
+    }
+}

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -9,6 +9,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Handler;
+import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.View;
 import android.view.ViewGroup;
@@ -571,7 +572,7 @@ public void testConstructorsExistAndMatch() throws Exception {
                 ObservableSupplier.class, BooleanSupplier.class, boolean.class, boolean.class,
                 boolean.class, boolean.class, boolean.class, HistoryDelegate.class,
                 BooleanSupplier.class, OfflineDownloader.class, boolean.class,
-                ObservableSupplier.class, Callback.class));
+                ObservableSupplier.class, Callback.class, boolean.class, ObservableSupplier.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",
                 "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator",
@@ -609,7 +610,7 @@ public void testConstructorsExistAndMatch() throws Exception {
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView",
                 "org/chromium/chrome/browser/share/send_tab_to_self/BraveManageAccountDevicesLinkView",
-                Context.class));
+                Context.class, AttributeSet.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesMediator",
                 "org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator",

app/app_management_strings.grdp

@@ -163,7 +163,7 @@
       You can open and edit supported files with this app from the File Explorer or other apps. To control which files open in this app by default, go to <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>Windows settings<ph name="END_LINK">&lt;/a&gt;</ph>.
     </message>
   </if>
-  <if expr="chromeos_ash or chromeos_lacros">
+  <if expr="is_chromeos">
     <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing the ChromeOS Files app) and a link to a learn more link for default filetype associations.">
       You can open and edit supported files with this app from the Files app or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
     </message>

app/app_management_strings_override.grdp

@@ -5,7 +5,7 @@
   </message>
   <if expr="is_win">
     </if>
-  <if expr="chromeos_ash or chromeos_lacros">
+  <if expr="is_chromeos">
     </if>
   <if expr="is_macosx">
     </if>

app/brave_main_delegate_browsertest.cc

@@ -7,7 +7,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/domain_reliability/service_factory.h"
 #include "chrome/browser/enterprise/connectors/analysis/content_analysis_features.h"
-#include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.h"
+#include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_features.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_test_utils.h"
@@ -89,6 +89,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &autofill::features::kAutofillUpstreamAllowAdditionalEmailDomains,
     &blink::features::kAdInterestGroupAPI,
     &blink::features::kAllowURNsInIframes,
+    &blink::features::kAnonymousIframeOriginTrial,
     &blink::features::kBrowsingTopics,
     &blink::features::kClientHintsMetaEquivDelegateCH,
     &blink::features::kComputePressure,
@@ -141,6 +142,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &history_clusters::internal::kOmniboxAction,
     &history_clusters::internal::kPersistContextAnnotationsInHistoryDb,
     &lens::features::kLensStandalone,
+    &lens::features::kLensUnifiedSidePanelFooter,
     &media::kLiveCaption,
     &net::features::kNoncedPartitionedCookies,
     &net::features::kPartitionedCookies,
@@ -150,8 +152,10 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &optimization_guide::features::kRemoteOptimizationGuideFetching,
     &optimization_guide::features::
         kRemoteOptimizationGuideFetchingAnonymousDataConsent,
+    &password_manager::features::kUnifiedPasswordManagerDesktop,
 #if !BUILDFLAG(IS_ANDROID)
     &permissions::features::kPermissionsPostPromptSurvey,
+    &permissions::features::kRecordPermissionExpirationTimestamps,
 #endif
     &permissions::features::kPermissionOnDeviceNotificationPredictions,
     &privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting,

app/chromeos_shared_strings.grdp

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- ChromeOS-specific strings (included from generated_resources.grd).
      Shared between both Ash and Lacros.
-     Everything in this file is wrapped in <if expr="chromeos_ash or chromeos_lacros">. -->
+     Everything in this file is wrapped in <if expr="is_chromeos">. -->
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
 
@@ -47,4 +47,9 @@
     Read and write access to <ph name="VOLUME_NAME">$1<ex>FooBar 4GB</ex></ph> has been granted.
   </message>
 
+  <!-- Strings for Plugin VM -->
+  <message name="IDS_PLUGIN_VM_APP_NAME" desc="Product name for 'Parallels Desktop'. Should not be translated as it is a third party name." translateable="false">
+    Parallels Desktop
+  </message>
+
 </grit-part>

app/extensions_strings.grdp

@@ -311,6 +311,9 @@
   <message name="IDS_EXTENSIONS_ITEM_SOURCE" desc="The label above an extension's source, which indicates where the extension came from (webstore, third-party, local disk, etc).">
     Source
   </message>
+  <message name="IDS_EXTENSIONS_ITEM_SOURCE_INSTALLED_BY_DEFAULT" desc="The text to indicate that an extension has been added by default for the user's profile.">
+    Installed by default
+  </message>
   <message name="IDS_EXTENSIONS_ITEM_SOURCE_POLICY" desc="The text to indicate that an extension has been added by enterprise policy.">
     Added by policy
   </message>
@@ -404,6 +407,9 @@
   <message name="IDS_EXTENSIONS_SITE_PERMISSIONS_ALL_SITES_PAGE_TITLE" desc="The title for the all sites subpage for extensions site permissions management.">
     All sites
   </message>
+  <message name="IDS_EXTENSIONS_SITE_PERMISSIONS_ALL_SITES_EXTENSION_COUNT" desc="The subtext displayed for sites in the all sites subpage showing the number of extensions that can run for that site.">
+    <ph name="NUM_EXTENSIONS">$1</ph> extensions
+  </message>
   <message name="IDS_EXTENSIONS_PERMITTED_SITES" desc="The label above the list of sites that extensions are always permitted to run in.">
     All extensions allowed
   </message>