Upgrade from Chromium 120 to Chromium 121 (1.62.x).

DEPS

@@ -127,11 +127,6 @@ hooks = [
                '--source-dir', '.',
                '--filter', '^[0-9]\{{1,\}}\.[0-9]\{{1,\}}\.[0-9]\{{1,\}}$'],
   },
-  {
-    'name': 'patch_ffmpeg',
-    'pattern': '.',
-    'action': ['vpython3', 'script/patch_ffmpeg.py'],
-  },
 ]
 
 include_rules = [

android/brave_java_sources.gni

@@ -75,6 +75,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkPage.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUiPrefs.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java",

android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd

@@ -391,6 +391,23 @@
           <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
       </message>
 
+      <!-- Tab Cleanup strings -->
+      <message name="IDS_TAB_CLEANUP_MESSAGE_CARD_TITLE" desc="Header for the Tab Cleanup message card where a user can review suggested tabs to close before closing or just close them outright.">
+          Want to close old tabs?
+      </message>
+      <message name="IDS_TAB_CLEANUP_MESSAGE_CARD_SUBTITLE" desc="Subtitle for the Tab Cleanup message card that indicates the number of suggested tabs a user can review to close before closing or just close them outright.">
+          {TABS_COUNT, plural,
+            =1 {You have <ph name="TABS_COUNT_ONE">%1$s<ex>1</ex></ph> tab you haven't used recently}
+            other {You have <ph name="TABS_COUNT_MANY">%1$s<ex>8</ex></ph> tabs you haven't used recently}
+          }
+      </message>
+      <message name="IDS_TAB_CLEANUP_MESSAGE_CARD_REVIEW_TABS_BUTTON" desc="Button text where a user can review suggested tabs to close before closing.">
+          Review tabs
+      </message>
+      <message name="IDS_TAB_CLEANUP_MESSAGE_CARD_CLOSE_TABS_BUTTON" desc="Button text where a user can close suggested tabs without reviewing them.">
+          Close without reviewing
+      </message>
+
       <!-- Accessibility strings for Tab Suggestion -->
       <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
         Review the suggestions.

android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java

@@ -11,6 +11,7 @@
 import androidx.annotation.Nullable;
 
 import org.chromium.chrome.browser.feed.sort_ui.FeedOptionsCoordinator;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
 import org.chromium.ui.modelutil.PropertyModel;
 
@@ -27,7 +28,8 @@ public class BraveFeedSurfaceMediator extends FeedSurfaceMediator {
             @FeedSurfaceCoordinator.StreamTabId int openingTabId,
             FeedActionDelegate actionDelegate,
             FeedOptionsCoordinator optionsCoordinator,
-            @Nullable UiConfig uiConfig) {
+            @Nullable UiConfig uiConfig,
+            Profile profile) {
         super(
                 coordinator,
                 context,
@@ -36,7 +38,8 @@ public class BraveFeedSurfaceMediator extends FeedSurfaceMediator {
                 openingTabId,
                 actionDelegate,
                 optionsCoordinator,
-                uiConfig);
+                uiConfig,
+                profile);
     }
 
     @Override

android/java/AndroidManifest.xml

@@ -10,7 +10,7 @@
     android:name="org.chromium.chrome.browser.rewards.tipping.RewardsTippingBannerActivity"
     android:theme="@style/TippingBraveTranslucent"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"
     android:exported="false" />
 
 <activity
@@ -35,119 +35,119 @@
     android:name="org.chromium.chrome.browser.onboarding.OnboardingActivity"
     android:theme="@style/Theme.Chromium.Activity.Fullscreen"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 <activity
     android:name="org.chromium.chrome.browser.onboarding.SearchActivity"
     android:theme="@style/Theme.Chromium.Activity.Fullscreen"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.firstrun.WelcomeOnboardingActivity"
     android:theme="@style/Theme.Chromium.Activity.Fullscreen"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.BraveWalletActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AssetDetailActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AddAccountActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AccountDetailActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AccountPrivateKeyActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AccountDetailsWithQrActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.NetworkSelectorActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AccountSelectorActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AddAssetActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.AdvanceTxSettingActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.BraveWalletDAppsActivity"
     android:theme="@style/BraveTranslucentMaterial"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.NftDetailActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.split_tunnel.SplitTunnelActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.activities.BraveVpnPlansActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:noHistory="true"
     android:launchMode="singleTask"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.activities.BraveVpnProfileActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:noHistory="true"
     android:launchMode="singleTask"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.activities.BraveVpnParentActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.activities.BraveVpnSupportActivity"
     android:theme="@style/Theme.Chromium.Activity"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity
     android:name="org.chromium.chrome.browser.playlist.PlaylistHostActivity"
     android:theme="@style/Theme.Chromium.Activity.Fullscreen"
     android:configChanges="orientation|keyboardHidden|screenSize"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <activity android:name="org.chromium.chrome.browser.settings.BraveSettingsActivity"
     android:theme="@style/Theme.Chromium.Settings"
@@ -176,7 +176,7 @@
     android:theme="@style/BraveProxyBillingActivityTheme"
     android:exported="false"
     android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity"/>
+    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
 
 <!-- Upgrade related -->
 <receiver android:name="org.chromium.chrome.browser.upgrade.BravePackageReplacedBroadcastReceiver"

android/java/apk_for_test.flags

@@ -132,7 +132,6 @@
     *** mOverlayPanelVisibilitySupplier;
     *** mTabModelSelector;
     *** mIncognitoStateProvider;
-    *** mTabCountProvider;
     *** mTabGroupUi;
     *** mBottomSheetController;
     *** mActivityLifecycleDispatcher;
@@ -203,11 +202,13 @@
 -keep class org.chromium.chrome.browser.bookmarks.BraveBookmarkUtils {
     *** addOrEditBookmark(...);
     *** showBookmarkManagerOnPhone(...);
+    *** isSpecialFolder(...);
 }
 
 -keep class org.chromium.chrome.browser.bookmarks.BookmarkUtils {
     *** addOrEditBookmark(...);
     *** showBookmarkManagerOnPhone(...);
+    *** isSpecialFolder(...);
 }
 
 -keep class org.chromium.chrome.browser.bookmarks.BookmarkToolbar {
@@ -476,14 +477,6 @@
     *** getResourceItem(...);
 }
 
--keep class org.chromium.components.browser_ui.site_settings.FourStateCookieSettingsPreference {
-    public <init>(...);
-}
-
--keep class org.chromium.components.browser_ui.site_settings.BraveFourStateCookieSettingsPreferenceBase {
-    public <init>(...);
-}
-
 -keep class org.chromium.components.browser_ui.site_settings.SiteSettings {
     public <init>(...);
 }
@@ -820,3 +813,11 @@
 -keep class org.chromium.chrome.browser.identity_disc.BraveIdentityDiscController {
     public <init>(...);
 }
+
+-keep class org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs {
+    <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.bookmarks.BraveBookmarkUiPrefs {
+    <init>(...);
+}

android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java

@@ -17,10 +17,13 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
+import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.brave_rewards.mojom.WalletStatus;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.BraveActivity;
+import org.chromium.chrome.browser.init.ActivityProfileProvider;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+import org.chromium.chrome.browser.profiles.ProfileProvider;
 
 public class BraveRewardsUserWalletActivity
         extends AsyncInitializationActivity implements View.OnClickListener {
@@ -139,4 +142,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    protected OneshotSupplier<ProfileProvider> createProfileProvider() {
+        return new ActivityProfileProvider(getLifecycleDispatcher());
+    }
 }

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

@@ -159,7 +159,6 @@
 import org.chromium.chrome.browser.site_settings.BraveWalletEthereumConnectedSites;
 import org.chromium.chrome.browser.speedreader.BraveSpeedReaderUtils;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tab.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -351,7 +350,7 @@ public void onPauseWithNative() {
 
     @Override
     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
-        final TabImpl currentTab = (TabImpl) getActivityTab();
+        final Tab currentTab = getActivityTab();
         // Handle items replaced by Brave.
         if (id == R.id.info_menu_id && currentTab != null) {
             ShareDelegate shareDelegate = (ShareDelegate) getShareDelegateSupplier().get();
@@ -396,7 +395,8 @@ public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
                             BraveVpnUtils.openBraveVpnProfileActivity(BraveActivity.this);
                         }
                     } else {
-                        BraveVpnUtils.showProgressDialog(BraveActivity.this,
+                        BraveVpnUtils.showProgressDialog(
+                                BraveActivity.this,
                                 getResources().getString(R.string.vpn_connect_text));
                         if (BraveVpnPrefUtils.isSubscriptionPurchase()) {
                             verifySubscription();
@@ -1114,7 +1114,7 @@ public void finishNativeInitialization() {
                         .readBoolean(BravePreferenceKeys.BRAVE_AD_FREE_CALLOUT_DIALOG, true)
                 && getActivityTab() != null
                 && getActivityTab().getUrl().getSpec() != null
-                && UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())
+                && UrlUtilities.isNtpUrl(getActivityTab().getUrl().getSpec())
                 && (ChromeSharedPreferences.getInstance()
                                 .readBoolean(BravePreferenceKeys.BRAVE_OPENED_YOUTUBE, false)
                         || ChromeSharedPreferences.getInstance()
@@ -1136,8 +1136,9 @@ && getActivityTab().getUrl().getSpec() != null
             handleDeepLinkVpn();
         } else if (!mIsDeepLink
                 && OnboardingPrefManager.getInstance().isOnboardingSearchBoxTooltip()
-                && getActivityTab() != null && getActivityTab().getUrl().getSpec() != null
-                && UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())) {
+                && getActivityTab() != null
+                && getActivityTab().getUrl().getSpec() != null
+                && UrlUtilities.isNtpUrl(getActivityTab().getUrl().getSpec())) {
             showSearchBoxTooltip();
         }
 
@@ -1455,8 +1456,9 @@ private void checkForNotificationData() {
                     checkForBraveStats();
                     break;
                 case RetentionNotificationUtil.DAY_6:
-                    if (getActivityTab() != null && getActivityTab().getUrl().getSpec() != null
-                            && !UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())) {
+                    if (getActivityTab() != null
+                            && getActivityTab().getUrl().getSpec() != null
+                            && !UrlUtilities.isNtpUrl(getActivityTab().getUrl().getSpec())) {
                         getTabCreator(false).launchUrl(
                                 UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
                     }
@@ -1489,8 +1491,9 @@ public void checkForBraveStats() {
         if (OnboardingPrefManager.getInstance().isBraveStatsEnabled()) {
             BraveStatsUtil.showBraveStats();
         } else {
-            if (getActivityTab() != null && getActivityTab().getUrl().getSpec() != null
-                    && !UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())) {
+            if (getActivityTab() != null
+                    && getActivityTab().getUrl().getSpec() != null
+                    && !UrlUtilities.isNtpUrl(getActivityTab().getUrl().getSpec())) {
                 OnboardingPrefManager.getInstance().setFromNotification(true);
                 if (getTabCreator(false) != null) {
                     getTabCreator(false).launchUrl(