Merge pull request #6554 from brave/cr87

Upgrade from Chromium 86 to Chromium 87.

android/brave_java_resources.gni

@@ -690,6 +690,12 @@ brave_java_resources = [
   "java/res/layout/binance_spinner_dropdown_item.xml",
   "java/res/layout/binance_spinner_item.xml",
   "java/res/layout/binance_summary_item.xml",
+  "java/res/layout/bottom_control_container.xml",
+  "java/res/layout/bottom_toolbar.xml",
+  "java/res/layout/bottom_toolbar_browsing.xml",
+  "java/res/layout/bottom_toolbar_menu_button.xml",
+  "java/res/layout/bottom_toolbar_tab_switcher.xml",
+  "java/res/layout/icon_row_menu_footer.xml",
   "java/res/layout/brave_ads_existing_user_dialog_layout.xml",
   "java/res/layout/brave_ads_new_user_dialog_layout.xml",
   "java/res/layout/brave_bookmark_toolbar.xml",
@@ -756,6 +762,7 @@ brave_java_resources = [
   "java/res/layout/ntp_widget_list_item_layout.xml",
   "java/res/layout/qa_code_check.xml",
   "java/res/layout/report_broken_site_layout.xml",
+  "java/res/layout/toolbar_space.xml",
   "java/res/layout/top_sites_layout.xml",
   "java/res/layout/tracker_item_layout.xml",
   "java/res/layout/user_wallet_activity.xml",

android/brave_java_sources.gni

@@ -12,6 +12,7 @@ import("//brave/components/safetynet/java_sources.gni")
 import("//components/feed/features.gni")
 
 brave_java_sources = [
+  "../../brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveAppHooks.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveBadge.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveFeatureList.java",
@@ -143,17 +144,37 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
+  "../../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",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java",
-  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java",
+  "../../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/BottomToolbarConfiguration.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/BrowsingModeBottomToolbarCoordinator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/ui/messages/infobar/BraveSimpleConfirmInfoBarBuilder.java",
   "../../brave/android/java/org/chromium/chrome/browser/upgrade/BravePackageReplacedBroadcastReceiver.java",
@@ -181,7 +202,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/ConvertAsset.java",
   "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetBottomSheetDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/widget/crypto/binance/CryptoWidgetTabAdapter.java",
-  "../../brave/android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java",
 ]
 
 if (brave_rewards_enabled || enable_brave_referrals) {
@@ -192,10 +212,6 @@ if (brave_ads_enabled) {
   brave_java_sources += brave_ads_java_sources
 }
 
-if (enable_feed_in_chrome) {
-  brave_java_sources += [ "//brave/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java" ]
-}
-
 if (enable_brave_sync) {
   brave_java_sources += [
     "../../brave/android/java/org/chromium/chrome/browser/BraveSyncInformers.java",
@@ -207,5 +223,7 @@ if (enable_brave_sync) {
 
 brave_components_browser_ui_site_settings_android_java = [ "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java" ]
 
+brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ]
+
 brave_java_base_sources =
     [ "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java" ]

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

@@ -15,7 +15,6 @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.feed.action.FeedActionHandler;
 import org.chromium.chrome.browser.feed.library.api.host.action.ActionApi;
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceDelegate;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
@@ -37,13 +36,13 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator {
     public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarManager,
             TabModelSelector tabModelSelector, Supplier<Tab> tabProvider,
             @Nullable SnapScrollHelper snapScrollHelper, @Nullable View ntpHeader,
-            @Nullable SectionHeaderView sectionHeaderView, FeedActionHandler.Options actionOptions,
+            @Nullable SectionHeaderView sectionHeaderView, FeedV1ActionOptions actionOptions,
             boolean showDarkBackground, FeedSurfaceDelegate delegate,
             @Nullable NativePageNavigationDelegate pageNavigationDelegate, Profile profile,
-            boolean isPlaceholderShown, BottomSheetController bottomSheetController) {
+            boolean isPlaceholderRequested, BottomSheetController bottomSheetController) {
         super(activity, snackbarManager, tabModelSelector, tabProvider, snapScrollHelper, ntpHeader,
                 sectionHeaderView, actionOptions, showDarkBackground, delegate,
-                pageNavigationDelegate, profile, isPlaceholderShown, bottomSheetController);
+                pageNavigationDelegate, profile, isPlaceholderRequested, bottomSheetController);
     }
 
     @Override

android/java/apk_for_test.flags

@@ -73,3 +73,54 @@
 -keep class org.chromium.base.CommandLineInitUtil {
     *** initCommandLine(...);
 }
+
+-keep class org.chromium.chrome.browser.ui.appmenu.AppMenu {
+    *** getPopupPosition(...);
+}
+
+-keep class org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator {
+    *** mMediator;
+}
+
+-keep class org.chromium.chrome.browser.toolbar.ToolbarManager {
+    *** mBottomControlsCoordinator;
+    *** mBrowserControlsSizer;
+    *** mFullscreenManager;
+    *** mActivityTabProvider;
+    *** mAppThemeColorProvider;
+    *** mShareDelegateSupplier;
+    *** mScrimCoordinator;
+    *** mActivity;
+    *** mShowStartSurfaceSupplier;
+    *** mOverviewModeBehaviorSupplier;
+    *** mMenuButtonCoordinator;
+    *** mToolbarTabController;
+    *** mLocationBar;
+    *** mActionModeController;
+    *** mLocationBarModel;
+    *** mToolbar;
+    *** mBookmarkBridgeSupplier;
+    *** onOrientationChange(...);
+    *** updateButtonStatus(...);
+    *** updateBookmarkButtonStatus(...);
+    *** updateReloadState(...);
+}
+
+-keep class org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator {
+    *** mTabSwitcherModeCoordinatorPhone;
+    *** mOptionalButtonController;
+}
+
+-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTCoordinatorPhone {
+    *** mTabSwitcherModeToolbar;
+}
+
+-keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTPhone {
+    *** mNewTabViewButton;
+    *** mNewTabImageButton;
+    *** mToggleTabStackButton;
+    *** mMenuButton;
+    *** mShouldShowNewTabVariation;
+    *** updateNewTabButtonVisibility(...);
+    *** shouldShowIncognitoToggle(...);
+}

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

@@ -15,6 +15,7 @@
 import androidx.appcompat.content.res.AppCompatResources;
 
 import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.BraveFeatureList;
@@ -29,6 +30,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
+import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
 
@@ -40,7 +42,7 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context,
             MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
             AppMenuDelegate appMenuDelegate,
-            @Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
+            OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
             ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
                 toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
@@ -58,6 +60,11 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) {
         // and removed when menu is dismissed.
         if (!shouldShowPageMenu()) return;
 
+        if (isMenuButtonInBottomToolbar()) {
+            // Do not show icon row on top when menu itself is on bottom
+            menu.findItem(R.id.icon_row_menu_id).setVisible(false).setEnabled(false);
+        }
+
         // Brave donesn't show help menu item in app menu.
         menu.findItem(R.id.help_id).setVisible(false).setEnabled(false);
 
@@ -126,4 +133,28 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
             shareButton.setContentDescription(mContext.getString(R.string.share));
         }
     }
+
+    @Override
+    public boolean shouldShowHeader(int maxMenuHeight) {
+        if (isMenuButtonInBottomToolbar()) return false;
+        return super.shouldShowHeader(maxMenuHeight);
+    }
+
+    @Override
+    public boolean shouldShowFooter(int maxMenuHeight) {
+        if (isMenuButtonInBottomToolbar()) return true;
+        return super.shouldShowFooter(maxMenuHeight);
+    }
+
+    @Override
+    public int getFooterResourceId() {
+        if (isMenuButtonInBottomToolbar()) {
+            return shouldShowPageMenu() ? R.layout.icon_row_menu_footer : 0;
+        }
+        return super.getFooterResourceId();
+    }
+
+    private boolean isMenuButtonInBottomToolbar() {
+        return BraveMenuButtonCoordinator.isMenuFromBottom();
+    }
 }

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

@@ -13,7 +13,7 @@
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator;
-import org.chromium.chrome.browser.feed.FeedProcessScopeFactory;
+import org.chromium.chrome.browser.feed.shared.FeedFeatures;
 import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -52,7 +52,7 @@ protected void initializeMainView(Activity activity, Supplier<Tab> tabProvider,
         // Override surface provider
         Profile profile = Profile.fromWebContents(mTab.getWebContents());
 
-        assert !FeedProcessScopeFactory.isFeedProcessEnabled();
+        assert !FeedFeatures.isFeedEnabled();
         mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
                 tabModelSelector, tabProvider,
                 new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,

android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java

@@ -11,8 +11,8 @@
 
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
 import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
-import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionHost;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;

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

@@ -9,6 +9,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+
 import androidx.preference.Preference;
 
 import org.chromium.base.ContextUtils;
@@ -20,10 +21,11 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
 import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
+import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
+import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
-import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.ui.base.DeviceFormFactor;
 
 public class AppearancePreferences extends BravePreferenceFragment
@@ -121,6 +123,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY,
                             !originalStatus)
                     .apply();
+            BraveMenuButtonCoordinator.setMenuFromBottom(!originalStatus);
             BraveRelaunchUtils.askForRelaunch(getActivity());
         } else if (PREF_HIDE_BRAVE_REWARDS_ICON.equals(key)) {
             SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();

android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java

@@ -6,6 +6,7 @@
 package org.chromium.chrome.browser.signin;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.sync.AndroidSyncSettings;
 import org.chromium.components.signin.AccountTrackerService;
@@ -40,6 +41,6 @@ private static SigninManager create(long nativeSigninManagerAndroid,
         assert identityMutator != null;
         return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService,
                 identityManager, identityMutator,
-                AndroidSyncSettings.get(), ExternalAuthUtils.getInstance());
+                AndroidSyncSettings.get(), AppHooks.get().getExternalAuthUtils());
     }
 }

android/java/org/chromium/chrome/browser/widget/tile/BraveTileWithTextView.java → android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java

@@ -3,25 +3,26 @@
  * 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.widget.tile;
+package org.chromium.chrome.browser.suggestions.tile;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
+import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
+import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
 import org.chromium.chrome.browser.preferences.BravePref;
-import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.suggestions.tile.TileWithTextView;
+import org.chromium.chrome.browser.suggestions.tile.TileView;
 import org.chromium.chrome.browser.tabmodel.TabModel;
-import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
-import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
+import org.chromium.components.user_prefs.UserPrefs;
 
-public class BraveTileWithTextView extends TileWithTextView {
-    public BraveTileWithTextView(Context context, AttributeSet attrs) {
+public class BraveTileView extends TileView {
+    public BraveTileView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 

android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java

@@ -5,15 +5,16 @@
 
 package org.chromium.chrome.browser.sync;
 
+import android.accounts.Account;
+
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.components.sync.SyncContentResolverDelegate;
 
 // see org.brave.bytecode.BraveAndroidSyncSettingsAdapter
 public class BraveAndroidSyncSettings extends AndroidSyncSettings {
     private boolean mMasterSyncEnabled;
 
-    public BraveAndroidSyncSettings(SyncContentResolverDelegate syncContentResolverDelegate) {
-        super(syncContentResolverDelegate);
+    public BraveAndroidSyncSettings(Account account) {
+        super(account);
     }
 
     // Chromium's AndroidSyncSettings.mChromeSyncEnabled is never set to true