[Android] Remove isGridTabSwitcherEnabled and isTabGroupsAndroidEnabled

Chromium changes:
https://github.com/brave/chromium/commit/f300646db04f84970e8d67045ce05dda5b968a90

[Tab Switcher] Remove isGridTabSwitcherEnabled
Now that M117 is branched and TabGroupsContinuationAndroid is the
default everywhere the old flags for the initial development of the Grid
Tab Switcher can finally be cleaned up.

This is the fourth step which removes the isGridTabSwitcherEnabled
method everywhere. As a result there are also a number of cascading
side effects in distant files.

Bug: 1466158

https://github.com/brave/chromium/commit/9724e9d8e7a2c1b07cd20964de56ab95bbdda72f

[Tab Switcher] Remove isTabGroupsAndroidEnabled
Now that M117 is branched and TabGroupsContinuationAndroid is the
default everywhere the old flags for the initial development of the Grid
Tab Switcher can finally be cleaned up.

This is the fifth step which removes the isTabGroupsAndroidEnabled
method everywhere. As a result there are also a number of cascading
side effects outside the tab switcher proper.

Bug: 1466158

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java

@@ -29,6 +29,7 @@ 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.IncognitoStateProvider;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabWindowManager;
 import org.chromium.components.omnibox.action.OmniboxActionDelegate;
 import org.chromium.ui.base.WindowAndroid;
@@ -66,7 +67,8 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator {
             @Nullable BackPressManager backPressManager,
             @NonNull OmniboxSuggestionsDropdownScrollListener
                     omniboxSuggestionsDropdownScrollListener,
-            @Nullable OpenHistoryClustersDelegate openHistoryClustersDelegate) {
+            @Nullable OpenHistoryClustersDelegate openHistoryClustersDelegate,
+            @Nullable ObservableSupplier<TabModelSelector> tabModelSelectorSupplier) {
         super(locationBarLayout, autocompleteAnchorView, profileObservableSupplier,
                 privacyPreferencesManager, locationBarDataProvider, actionModeCallback,
                 windowDelegate, windowAndroid, activityTabSupplier, modalDialogManagerSupplier,
@@ -76,7 +78,8 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator {
                 tabWindowManagerSupplier, bookmarkState, isToolbarMicEnabledSupplier,
                 merchantTrustSignalsCoordinatorSupplier, omniboxActionDelegate,
                 browserControlsVisibilityDelegate, reportExceptionCallback, backPressManager,
-                omniboxSuggestionsDropdownScrollListener, openHistoryClustersDelegate);
+                omniboxSuggestionsDropdownScrollListener, openHistoryClustersDelegate,
+                tabModelSelectorSupplier);
 
         if (mLocationBarMediator instanceof BraveLocationBarMediator) {
             mQRButton = locationBarLayout.findViewById(R.id.qr_button);

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java

@@ -12,6 +12,7 @@ import android.os.Build;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.chromium.base.supplier.ObservableSupplier;
@@ -20,6 +21,7 @@ import org.chromium.chrome.browser.lens.LensController;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.theme.ThemeUtils;
 import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
 import org.chromium.components.search_engines.TemplateUrlService;
@@ -52,12 +54,13 @@ public class BraveLocationBarMediator extends LocationBarMediator {
             @NonNull LensController lensController,
             @NonNull SaveOfflineButtonState saveOfflineButtonState, @NonNull OmniboxUma omniboxUma,
             @NonNull BooleanSupplier isToolbarMicEnabledSupplier,
-            @NonNull OmniboxSuggestionsDropdownEmbedderImpl dropdownEmbedder) {
+            @NonNull OmniboxSuggestionsDropdownEmbedderImpl dropdownEmbedder,
+            @Nullable ObservableSupplier<TabModelSelector> tabModelSelectorSupplier) {
         super(context, locationBarLayout, locationBarDataProvider, profileSupplier,
                 privacyPreferencesManager, overrideUrlLoadingDelegate, localeManager,
                 templateUrlServiceSupplier, backKeyBehavior, windowAndroid, isTablet,
                 searchEngineLogoUtils, lensController, saveOfflineButtonState, omniboxUma,
-                isToolbarMicEnabledSupplier, dropdownEmbedder);
+                isToolbarMicEnabledSupplier, dropdownEmbedder, tabModelSelectorSupplier);
     }
 
     public static Class<OmniboxUma> getOmniboxUmaClass() {

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

@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tasks.tab_management.TabGroupUi;
 import org.chromium.chrome.browser.tasks.tab_management.TabManagementDelegateProvider;
-import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.theme.TopUiThemeColorProvider;
 import org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
@@ -211,16 +210,13 @@ public class BraveToolbarManager extends ToolbarManager {
                     (ViewStub) mActivity.findViewById(R.id.bottom_controls_stub);
             mBottomControls =
                     (BraveScrollingBottomViewResourceFrameLayout) bottomControlsStub.inflate();
-            if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mActivity)) {
-                mTabGroupUi = TabManagementDelegateProvider.getDelegate().createTabGroupUi(
-                        mActivity, mBottomControls.findViewById(R.id.bottom_container_slot),
-                        mBrowserControlsSizer, mIncognitoStateProvider, mScrimCoordinator,
-                        mOmniboxFocusStateSupplier, mBottomSheetController,
-                        mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
-                        mTabContentManager, mCompositorViewHolder,
-                        mCompositorViewHolder::getDynamicResourceLoader, mTabCreatorManager,
-                        mLayoutStateProviderSupplier, mSnackbarManager);
-            }
+            mTabGroupUi = TabManagementDelegateProvider.getDelegate().createTabGroupUi(mActivity,
+                    mBottomControls.findViewById(R.id.bottom_container_slot), mBrowserControlsSizer,
+                    mIncognitoStateProvider, mScrimCoordinator, mOmniboxFocusStateSupplier,
+                    mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier,
+                    mTabModelSelector, mTabContentManager, mCompositorViewHolder,
+                    mCompositorViewHolder::getDynamicResourceLoader, mTabCreatorManager,
+                    mLayoutStateProviderSupplier, mSnackbarManager);
             mBottomControlsCoordinatorSupplier.set(new BraveBottomControlsCoordinator(
                     mLayoutStateProviderSupplier,
                     BottomTabSwitcherActionMenuCoordinator.createOnLongClickListener(

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

@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.layouts.LayoutType;
 import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
 import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tasks.ReturnToChromeUtil;
-import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.LocationBarModel;
@@ -277,15 +276,7 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
      */
     void setBottomToolbarVisible(boolean isVisible) {
         if (mTabSwitcherModeCoordinator != null) {
-            try {
-                ChromeActivity activity = BraveActivity.getBraveActivity();
-                mTabSwitcherModeCoordinator.showToolbarOnTop(
-                        !isVisible, TabUiFeatureUtilities.isGridTabSwitcherEnabled(activity));
-            } catch (BraveActivity.BraveActivityNotFoundException e) {
-                Log.e(TAG, "setBottomToolbarVisible " + e);
-                mTabSwitcherModeCoordinator.showToolbarOnTop(
-                        !isVisible, TabUiFeatureUtilities.isGridTabSwitcherEnabled(mContext));
-            }
+            mTabSwitcherModeCoordinator.showToolbarOnTop(!isVisible, true);
         }
         mBrowsingModeCoordinator.onVisibilityChanged(isVisible);
     }

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

@@ -18,12 +18,11 @@ class BraveTabSwitcherModeTTCoordinator extends TabSwitcherModeTTCoordinator {
     private MenuButtonCoordinator mBraveMenuButtonCoordinator;
 
     BraveTabSwitcherModeTTCoordinator(ViewStub tabSwitcherToolbarStub,
-            MenuButtonCoordinator menuButtonCoordinator, boolean isGridTabSwitcherEnabled,
-            boolean isTabToGtsAnimationEnabled, BooleanSupplier isIncognitoModeEnabledSupplier,
+            MenuButtonCoordinator menuButtonCoordinator, boolean isTabToGtsAnimationEnabled,
+            BooleanSupplier isIncognitoModeEnabledSupplier,
             ToolbarColorObserverManager toolbarColorObserverManager) {
-        super(tabSwitcherToolbarStub, menuButtonCoordinator, isGridTabSwitcherEnabled,
-                isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier,
-                toolbarColorObserverManager);
+        super(tabSwitcherToolbarStub, menuButtonCoordinator, isTabToGtsAnimationEnabled,
+                isIncognitoModeEnabledSupplier, toolbarColorObserverManager);
 
         mBraveMenuButtonCoordinator = menuButtonCoordinator;
     }

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

@@ -92,9 +92,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             if (!isStartSurfaceEnabled) {
                 mTabSwitcherModeCoordinator = new BraveTabSwitcherModeTTCoordinator(
                         controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub),
-                        overviewModeMenuButtonCoordinator, isGridTabSwitcherEnabled,
-                        isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier,
-                        mToolbarColorObserverManager);
+                        overviewModeMenuButtonCoordinator, isTabToGtsAnimationEnabled,
+                        isIncognitoModeEnabledSupplier, mToolbarColorObserverManager);
             }
         }
     }

browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_search/BraveSearchBannerProcessor.java

@@ -46,7 +46,7 @@ public class BraveSearchBannerProcessor implements DropdownItemProcessor {
                 mUrlBarDelegate.loadUrl("https://search.brave.com/search?q="
                                 + mUrlBarEditingTextProvider.getTextWithoutAutocomplete()
                                 + "&action=makeDefault",
-                        PageTransition.LINK, System.currentTimeMillis());
+                        PageTransition.LINK, System.currentTimeMillis(), /*openInNewTab=*/false);
             }
 
             @Override