Upgrade from Chromium 88 to Chromium 89.

android/brave_java_sources.gni

@@ -40,6 +40,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/QRCodeShareDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/SetDefaultBrowserActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/app/BraveActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java",
@@ -125,6 +126,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java",
+  "../../brave/android/java/org/chromium/chrome/browser/query_tiles/BraveQueryTileSection.java",
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateUtils.java",
@@ -161,7 +163,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java",
-  "../../brave/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java",
@@ -172,7 +173,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java",
@@ -240,6 +240,8 @@ brave_components_browser_ui_site_settings_android_java = [ "//brave/components/b
 
 brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ]
 
+brave_browser_ui_android_toolbar_sources = [ "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java" ]
+
 brave_java_base_sources = [
   "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java",
   "//brave/android/java/org/chromium/base/BraveReflectionUtil.java",

android/java/apk_for_test.flags

@@ -9,7 +9,6 @@
 -keepnames class org.chromium.chrome.browser.settings.MainSettings
 
 -keep class org.chromium.chrome.browser.sync.AndroidSyncSettings {
-    *** notifyObservers(...);
     *** updateCachedSettings(...);
     *** setChromeSyncEnabled(...);
     *** mIsSyncable;
@@ -37,7 +36,6 @@
 
 -keep class org.chromium.chrome.browser.ntp.NewTabPageLayout {
     *** insertSiteSectionView(...);
-    *** getMaxRowsForMostVisitedTiles(...);
     *** mSiteSectionView;
 }
 
@@ -83,6 +81,7 @@
 }
 
 -keep class org.chromium.chrome.browser.toolbar.ToolbarManager {
+    public <init>(...);
     *** mBottomControlsCoordinatorSupplier;
     *** mCallbackController;
     *** mBrowserControlsSizer;
@@ -99,6 +98,11 @@
     *** mLocationBarModel;
     *** mToolbar;
     *** mBookmarkBridgeSupplier;
+    *** mLayoutManager;
+    *** mOverlayPanelVisibilitySupplier;
+    *** mTabModelSelector;
+    *** mIncognitoStateProvider;
+    *** mTabCountProvider;
     *** onOrientationChange(...);
     *** updateButtonStatus(...);
     *** updateBookmarkButtonStatus(...);
@@ -145,10 +149,6 @@
     public <init>(...);
 }
 
--keep class org.chromium.chrome.browser.tabbed_mode.BraveTabbedRootUiCoordinator {
-    public <init>(...);
-}
-
 -keep class org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate {
     public <init>(...);
 }
@@ -173,3 +173,23 @@
     *** addBookmarkInternal(...);
     *** createSnackbarControllerForEditButton(...);
 }
+
+-keep class org.chromium.chrome.browser.toolbar.BraveToolbarManager {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.toolbar.bottom.BottomControlsMediator {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsMediator {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.query_tiles.QueryTileSection {
+    *** getMaxRowsForMostVisitedTiles(...);
+}
+
+-keep class org.chromium.chrome.browser.query_tiles.BraveQueryTileSection {
+    *** getMaxRowsForMostVisitedTiles(...);
+}

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

@@ -180,7 +180,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
 
     private BraveRewardsExternalWallet mExternal_wallet;
 
-    private double walletBalance = .0;
+    private double walletBalance;
 
     private View braveRewardsOnboardingModalView;
     private View braveRewardsOptInView;

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

@@ -9,21 +9,21 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveSyncWorker;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.settings.BraveSyncScreensPreference;
-import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder;
 import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder;
+import org.chromium.components.browser_ui.settings.SettingsLauncher;
 
 public class BraveSyncInformers {
     public static void show() {

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

@@ -14,9 +14,8 @@
 // The purpose of this class is to hide BraveSyncWorker object under `enable_brave_sync`
 // and create it without explict import
 public class BraveSyncReflectionUtils {
-
-    private static Object sBraveSyncWorker = null;
-    private static boolean sInitialized = false;
+    private static Object sBraveSyncWorker;
+    private static boolean sInitialized;
     private static String TAG = "SYNC";
 
     public static Object getSyncWorker() {

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

@@ -0,0 +1,126 @@
+/* Copyright (c) 2021 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.app.appmenu;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+import org.chromium.chrome.browser.download.DownloadUtils;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
+import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
+
+/**
+ * A {@link LinearLayout} that displays a horizontal row of icons for page actions.
+ */
+public class AppMenuIconRowFooter extends LinearLayout implements View.OnClickListener {
+    private AppMenuHandler mAppMenuHandler;
+    private AppMenuDelegate mAppMenuDelegate;
+
+    private ImageButton mForwardButton;
+    private ImageButton mBookmarkButton;
+    private ImageButton mDownloadButton;
+    private ImageButton mPageInfoButton;
+    private ImageButton mReloadButton;
+
+    public AppMenuIconRowFooter(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        mForwardButton = findViewById(R.id.forward_menu_id);
+        mForwardButton.setOnClickListener(this);
+
+        mBookmarkButton = findViewById(R.id.bookmark_this_page_id);
+        mBookmarkButton.setOnClickListener(this);
+
+        mDownloadButton = findViewById(R.id.offline_page_id);
+        mDownloadButton.setOnClickListener(this);
+
+        mPageInfoButton = findViewById(R.id.info_menu_id);
+        mPageInfoButton.setOnClickListener(this);
+
+        mReloadButton = findViewById(R.id.reload_menu_id);
+        mReloadButton.setOnClickListener(this);
+
+        // ImageView tinting doesn't work with LevelListDrawable, use Drawable tinting instead.
+        // See https://crbug.com/891593 for details.
+        Drawable icon = AppCompatResources.getDrawable(getContext(), R.drawable.btn_reload_stop);
+        DrawableCompat.setTintList(icon,
+                AppCompatResources.getColorStateList(
+                        getContext(), R.color.default_icon_color_tint_list));
+        mReloadButton.setImageDrawable(icon);
+    }
+
+    /**
+     * Initializes the icons, setting enabled state, drawables, and content descriptions.
+     * @param appMenuHandler The {@link AppMenu} that contains the icon row.
+     * @param bookmarkBridge The {@link BookmarkBridge} used to retrieve information about
+     *                       bookmarks.
+     * @param currentTab The current activity {@link Tab}.
+     * @param appMenuDelegate The AppMenuDelegate to handle options item selection.
+     */
+    public void initialize(AppMenuHandler appMenuHandler, BookmarkBridge bookmarkBridge,
+            Tab currentTab, AppMenuDelegate appMenuDelegate) {
+        mAppMenuHandler = appMenuHandler;
+        mAppMenuDelegate = appMenuDelegate;
+
+        mForwardButton.setEnabled(currentTab.canGoForward());
+
+        updateBookmarkMenuItem(bookmarkBridge, currentTab);
+
+        mDownloadButton.setEnabled(DownloadUtils.isAllowedToDownloadPage(currentTab));
+
+        loadingStateChanged(currentTab.isLoading());
+    }
+
+    @Override
+    public void onClick(View v) {
+        mAppMenuDelegate.onOptionsItemSelected(v.getId(), null);
+        mAppMenuHandler.hideAppMenu();
+    }
+
+    /**
+     * Called when the current tab's load state  has changed.
+     * @param isLoading Whether the tab is currently loading.
+     */
+    public void loadingStateChanged(boolean isLoading) {
+        mReloadButton.getDrawable().setLevel(isLoading
+                        ? getResources().getInteger(R.integer.reload_button_level_stop)
+                        : getResources().getInteger(R.integer.reload_button_level_reload));
+        mReloadButton.setContentDescription(isLoading
+                        ? getContext().getString(R.string.accessibility_btn_stop_loading)
+                        : getContext().getString(R.string.accessibility_btn_refresh));
+    }
+
+    private void updateBookmarkMenuItem(BookmarkBridge bookmarkBridge, Tab currentTab) {
+        mBookmarkButton.setEnabled(bookmarkBridge.isEditBookmarksEnabled());
+
+        if (bookmarkBridge.hasBookmarkIdForTab(currentTab)) {
+            mBookmarkButton.setImageResource(R.drawable.btn_star_filled);
+            mBookmarkButton.setContentDescription(getContext().getString(R.string.edit_bookmark));
+            ApiCompatibilityUtils.setImageTintList(mBookmarkButton,
+                    AppCompatResources.getColorStateList(getContext(), R.color.blue_mode_tint));
+        } else {
+            mBookmarkButton.setImageResource(R.drawable.btn_star);
+            mBookmarkButton.setContentDescription(
+                    getContext().getString(R.string.accessibility_menu_bookmark));
+        }
+    }
+}

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

@@ -19,6 +19,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.BraveFeatureList;
+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.flags.ChromeFeatureList;
@@ -37,6 +38,7 @@
 
 public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
     private Menu mMenu;
+    AppMenuDelegate mAppMenuDelegate;
 
     public BraveTabbedAppMenuPropertiesDelegate(Context context,
             ActivityTabProvider activityTabProvider,
@@ -49,6 +51,8 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
                 toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
                 bookmarkBridgeSupplier, modalDialogManager);
+
+        mAppMenuDelegate = appMenuDelegate;
     }
 
     @Override
@@ -121,6 +125,12 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
         }
         super.onFooterViewInflated(appMenuHandler, view);
 
+        if (view instanceof AppMenuIconRowFooter) {
+            ((AppMenuIconRowFooter) view)
+                    .initialize(appMenuHandler, mBookmarkBridge, mActivityTabProvider.get(),
+                            mAppMenuDelegate);
+        }
+
         // Hide bookmark button if bottom toolbar is enabled
         ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id);
         if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) {

android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/ArrowColorDrawable.java

@@ -18,7 +18,11 @@
 import androidx.annotation.ColorInt;
 
 public class ArrowColorDrawable extends ColorDrawable {
-    public static final int LEFT = 0, TOP = 1, RIGHT = 2, BOTTOM = 3, AUTO = 4;
+    public static final int LEFT = 0;
+    public static final int TOP = 1;
+    public static final int RIGHT = 2;
+    public static final int BOTTOM = 3;
+    public static final int AUTO = 4;
 
     private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final int mBackgroundColor;
@@ -82,6 +86,7 @@ public void setAlpha(int alpha) {
         mPaint.setAlpha(alpha);
     }
 
+    @Override
     public void setColor(@ColorInt int color) {
         mPaint.setColor(color);
     }

android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java

@@ -64,7 +64,7 @@ public class PopupWindowTooltip implements PopupWindow.OnDismissListener {
     private final float mPadding;
     private final float mArrowWidth;
     private final float mArrowHeight;
-    private boolean dismissed = false;
+    private boolean dismissed;
     private int width;
     private int height;
 
@@ -311,7 +311,8 @@ public void onGlobalLayout() {
                     RectF achorRect = PopupWindowTooltipUtils.calculeRectOnScreen(mAnchorView);
                     RectF contentViewRect =
                             PopupWindowTooltipUtils.calculeRectOnScreen(mContentLayout);
-                    float x, y;
+                    float x;
+                    float y;
                     if (mArrowDirection == ArrowColorDrawable.TOP
                             || mArrowDirection == ArrowColorDrawable.BOTTOM) {
                         x = mContentLayout.getPaddingLeft() + dpToPx(mContext, 2);
@@ -379,7 +380,7 @@ public static class Builder {
         private final Context context;
         private boolean dismissOnInsideTouch = true;
         private boolean dismissOnOutsideTouch = true;
-        private boolean modal = false;
+        private boolean modal;
         private View contentView;
         private View anchorView;
         private int arrowDirection = ArrowColorDrawable.AUTO;