Upgrade from Chromium 89 to Chromium 90 (1.23.x).

DEPS

@@ -39,10 +39,17 @@ hooks = [
     'action': ['vpython3', 'script/download_rust_deps.py', '--platform', 'ios'],
   },
   {
-    # Download rust deps if necessary for Linux, macOS, Windows
+    # Download rust deps if necessary for Windows
     'name': 'download_rust_deps',
     'pattern': '.',
-    'condition': 'not checkout_android and not checkout_ios',
+    'condition': 'checkout_win',
+    'action': ['vpython', 'script/download_rust_deps.py'],
+  },
+  {
+    # Download rust deps if necessary for Linux and macOS
+    'name': 'download_rust_deps',
+    'pattern': '.',
+    'condition': 'not checkout_android and not checkout_ios and not checkout_win',
     'action': ['vpython3', 'script/download_rust_deps.py'],
   },
   {

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

@@ -17,14 +17,17 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
+import org.chromium.chrome.browser.ntp.ScrollableContainerDelegate;
 import org.chromium.chrome.browser.ntp.SnapScrollHelper;
 import org.chromium.chrome.browser.ntp.snippets.SectionHeaderView;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.ui.UiUtils;
+import org.chromium.ui.base.WindowAndroid;
 
 public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
     private Activity mActivity;
@@ -33,15 +36,18 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
     private FrameLayout mRootView;
 
     public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
-            TabModelSelector tabModelSelector, Supplier<Tab> tabProvider,
+            TabModelSelector tabModelSelector, WindowAndroid windowAndroid,
             @Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader,
             @Nullable SectionHeaderView sectionHeaderView, FeedV1ActionOptions actionOptions,
             boolean showDarkBackground, FeedSurfaceDelegate delegate,
             @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
-            boolean isPlaceholderRequested, BottomSheetController bottomSheetController) {
-        super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader,
-                sectionHeaderView, actionOptions, showDarkBackground, delegate,
-                pageNavigationDelegate, profile, isPlaceholderRequested, bottomSheetController);
+            boolean isPlaceholderShownInitially, BottomSheetController bottomSheetController,
+            Supplier<ShareDelegate> shareDelegateSupplier,
+            @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate) {
+        super(activity, snackbarManager, tabModelSelector, windowAndroid, snapScrollHelper,
+                ntpHeader, sectionHeaderView, actionOptions, showDarkBackground, delegate,
+                pageNavigationDelegate, profile, isPlaceholderShownInitially, bottomSheetController,
+                shareDelegateSupplier, externalScrollableContainerDelegate);
     }
 
     @Override

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

@@ -172,10 +172,10 @@ public void onResumeWithNative() {
 
     @Override
     public void onPauseWithNative() {
+        super.onPauseWithNative();
         if (mBraveRewardsNativeWorker != null) {
             mBraveRewardsNativeWorker.RemoveObserver(this);
         }
-        super.onPauseWithNative();
     }
 
     @Override

android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java

@@ -19,6 +19,7 @@
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
+import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
@@ -32,10 +33,10 @@ public BraveAppMenuPropertiesDelegateImpl(Context context,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
             @Nullable OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
             ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
-            ModalDialogManager modalDialogManager) {
+            ModalDialogManager modalDialogManager, WebFeedBridge webFeedBridge) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
                 toolbarManager, decorView, overviewModeBehaviorSupplier, bookmarkBridgeSupplier,
-                modalDialogManager);
+                modalDialogManager, webFeedBridge);
     }
 
     @Override

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

@@ -22,6 +22,7 @@
 import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
+import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
@@ -47,10 +48,10 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
             AppMenuDelegate appMenuDelegate,
             OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
             ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
-            ModalDialogManager modalDialogManager) {
+            ModalDialogManager modalDialogManager, WebFeedBridge webFeedBridge) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
                 toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
-                bookmarkBridgeSupplier, modalDialogManager);
+                bookmarkBridgeSupplier, modalDialogManager, webFeedBridge);
 
         mAppMenuDelegate = appMenuDelegate;
     }

android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java

@@ -84,8 +84,8 @@ public static PendingIntentProvider getDeepLinkIntent(Context context) {
         Intent intent = new Intent(context, BraveOnboardingNotification.class);
         intent.setAction(DEEP_LINK);
         return new PendingIntentProvider(
-                   PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT),
-                   0);
+                PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT),
+                0, 0);
     }
 
     @Override

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java

@@ -9,6 +9,7 @@
 
 import androidx.annotation.Nullable;
 
+import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
@@ -17,11 +18,13 @@
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.native_page.NativePageHost;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+import org.chromium.ui.base.WindowAndroid;
 
 public class BraveNewTabPage extends NewTabPage {
     private NewTabPageLayout mNewTabPageLayout;
@@ -32,10 +35,11 @@ public BraveNewTabPage(Activity activity,
             Supplier<Tab> activityTabProvider, SnackbarManager snackbarManager,
             ActivityLifecycleDispatcher lifecycleDispatcher, TabModelSelector tabModelSelector,
             boolean isTablet, NewTabPageUma uma, boolean isInNightMode,
-            NativePageHost nativePageHost, Tab tab, BottomSheetController bottomSheetController) {
+            NativePageHost nativePageHost, Tab tab, BottomSheetController bottomSheetController,
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier, WindowAndroid windowAndroid) {
         super(activity, browserControlsStateProvider, activityTabProvider, snackbarManager,
                 lifecycleDispatcher, tabModelSelector, isTablet, uma, isInNightMode, nativePageHost,
-                tab, bottomSheetController);
+                tab, bottomSheetController, shareDelegateSupplier, windowAndroid);
 
         assert mNewTabPageLayout instanceof BraveNewTabPageLayout;
         if (mNewTabPageLayout instanceof BraveNewTabPageLayout) {
@@ -44,19 +48,20 @@ public BraveNewTabPage(Activity activity,
     }
 
     @Override
-    protected void initializeMainView(Activity activity, Supplier<Tab> tabProvider,
+    protected void initializeMainView(Activity activity, WindowAndroid windowAndroid,
             SnackbarManager snackbarManager, TabModelSelector tabModelSelector, NewTabPageUma uma,
-            boolean isInNightMode, BottomSheetController bottomSheetController) {
-        super.initializeMainView(activity, tabProvider, snackbarManager, tabModelSelector, uma,
-                isInNightMode, bottomSheetController);
+            boolean isInNightMode, BottomSheetController bottomSheetController,
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier) {
+        super.initializeMainView(activity, windowAndroid, snackbarManager, tabModelSelector, uma,
+                isInNightMode, bottomSheetController, shareDelegateSupplier);
         // Override surface provider
         Profile profile = Profile.fromWebContents(mTab.getWebContents());
 
         assert !FeedFeatures.isFeedEnabled();
         mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
-                tabModelSelector, tabProvider,
+                tabModelSelector, windowAndroid,
                 new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,
                 null, null, isInNightMode, this, mNewTabPageManager.getNavigationDelegate(),
-                profile, false, bottomSheetController);
+                profile, false, bottomSheetController, shareDelegateSupplier, null);
     }
 }

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java

@@ -111,6 +111,7 @@
 import org.chromium.chrome.browser.widget.crypto.binance.CryptoWidgetBottomSheetDialogFragment;
 import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
 import org.chromium.components.user_prefs.UserPrefs;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.widget.Toast;
 
 import java.util.ArrayList;
@@ -503,14 +504,15 @@ public void initialize(NewTabPageManager manager, Activity activity,
             TileGroup.Delegate tileGroupDelegate, boolean searchProviderHasLogo,
             boolean searchProviderIsGoogle, ScrollDelegate scrollDelegate,
             ContextMenuManager contextMenuManager, UiConfig uiConfig, Supplier<Tab> tabProvider,
-            ActivityLifecycleDispatcher lifecycleDispatcher, NewTabPageUma uma) {
+            ActivityLifecycleDispatcher lifecycleDispatcher, NewTabPageUma uma, boolean isIncognito,
+            WindowAndroid windowAndroid) {
         super.initialize(manager, activity, tileGroupDelegate, searchProviderHasLogo,
                 searchProviderIsGoogle, scrollDelegate, contextMenuManager, uiConfig, tabProvider,
-                lifecycleDispatcher, uma);
+                lifecycleDispatcher, uma, isIncognito, windowAndroid);
 
         assert (activity instanceof BraveActivity);
         mActivity = activity;
-        ((BraveActivity)mActivity).dismissShieldsTooltip();
+        ((BraveActivity) mActivity).dismissShieldsTooltip();
     }
 
     private void showNTPImage(NTPImage ntpImage) {

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

@@ -95,6 +95,7 @@ private void updateBravePreferences() {
         removePreferenceIfPresent(MainSettings.PREF_SEARCH_ENGINE);
         removePreferenceIfPresent(MainSettings.PREF_UI_THEME);
         removePreferenceIfPresent(MainSettings.PREF_DOWNLOADS);
+        removePreferenceIfPresent(MainSettings.PREF_SAFETY_CHECK);
         removePreferenceIfPresent(PREF_LANGUAGES);
 
         updateSearchEnginePreference();

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

@@ -36,4 +36,7 @@ public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
 
     @Override
     public void onTabStateInitialized() {}
+
+    @Override
+    public void onTabHidden(Tab tab) {}
 }

android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java

@@ -18,8 +18,8 @@
 import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.suggestions.tile.TileView;
 import org.chromium.chrome.browser.tabmodel.TabModel;
+import org.chromium.components.browser_ui.widget.tile.TileView;
 import org.chromium.components.user_prefs.UserPrefs;
 
 public class BraveTileView extends TileView {

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

@@ -35,7 +35,6 @@
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
-import org.chromium.chrome.browser.intent.IntentMetadata;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
@@ -131,7 +130,7 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont
             ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
             OneshotSupplier<StartSurface> startSurfaceSupplier,
             ObservableSupplier<Boolean> omniboxFocusStateSupplier,
-            OneshotSupplier<IntentMetadata> intentMetadataOneshotSupplier,
+            OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
             OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
             Supplier<Boolean> isInOverviewModeSupplier, boolean isCustomTab,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,

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

@@ -21,6 +21,7 @@
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.TintObserver;
+import org.chromium.chrome.browser.theme.ThemeUtils;
 import org.chromium.chrome.browser.toolbar.ToolbarColors;
 import org.chromium.ui.widget.ChromeImageButton;
 
@@ -104,7 +105,7 @@ private void updateBackground() {
             return;
         }
         mBackground.setColorFilter(
-                ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage(mResources,
+                ThemeUtils.getTextBoxColorForToolbarBackgroundInNonNativePage(mResources,
                         mThemeColorProvider.getThemeColor(),
                         mThemeColorProvider.useLight()
                                 && mIncognitoStateProvider.isIncognitoSelected()),

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

@@ -20,7 +20,6 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver;
-import org.chromium.components.browser_ui.widget.FeatureHighlightProvider;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 
@@ -48,16 +47,13 @@ class BrowsingModeBottomToolbarMediator implements ThemeColorObserver {
     /** A provider that notifies components when the theme color changes.*/
     private ThemeColorProvider mThemeColorProvider;
 
-    private FeatureHighlightProvider mFeatureHighlightProvider;
-
     /**
      * Build a new mediator that handles events from outside the bottom toolbar.
      * @param model The {@link BrowsingModeBottomToolbarModel} that holds all the state for the
      *              browsing mode  bottom toolbar.
      */
     BrowsingModeBottomToolbarMediator(BrowsingModeBottomToolbarModel model) {
         mModel = model;
-        mFeatureHighlightProvider = AppHooks.get().createFeatureHighlightProvider();
     }
 
     void setThemeColorProvider(ThemeColorProvider themeColorProvider) {

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

@@ -20,6 +20,7 @@
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver;
 import org.chromium.chrome.browser.theme.ThemeColorProvider.TintObserver;
+import org.chromium.chrome.browser.theme.ThemeUtils;
 import org.chromium.chrome.browser.toolbar.ToolbarColors;
 import org.chromium.ui.widget.ChromeImageButton;
 
@@ -95,7 +96,7 @@ public void onIncognitoStateChanged(boolean isIncognito) {
     private void updateBackground() {
         if (mThemeColorProvider == null || mIncognitoStateProvider == null) return;
 
-        mBackground.setColorFilter(ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage(
+        mBackground.setColorFilter(ThemeUtils.getTextBoxColorForToolbarBackgroundInNonNativePage(
                                            mResources, mThemeColorProvider.getThemeColor(),
                                            mIncognitoStateProvider.isIncognitoSelected()
                                                    && mThemeColorProvider.useLight()),

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

@@ -15,9 +15,11 @@ class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinato
     private boolean mIsBottomToolbarVisible;
     private MenuButtonCoordinator mBraveMenuButtonCoordinator;
 
-    BraveTabSwitcherModeTTCoordinatorPhone(
-            ViewStub tabSwitcherToolbarStub, MenuButtonCoordinator menuButtonCoordinator) {
-        super(tabSwitcherToolbarStub, menuButtonCoordinator);
+    BraveTabSwitcherModeTTCoordinatorPhone(ViewStub tabSwitcherToolbarStub,
+            MenuButtonCoordinator menuButtonCoordinator, boolean isGridTabSwitcherEnabled,
+            boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled) {
+        super(tabSwitcherToolbarStub, menuButtonCoordinator, isGridTabSwitcherEnabled,
+                isTabToGtsAnimationEnabled, isStartSurfaceEnabled);
         mBraveMenuButtonCoordinator = menuButtonCoordinator;
     }