Android: Ensure bottom controls is not enabled on CCT

Bottom controls UI was enabled only on tabbed chrome UI but
a bug in https://crrev.com/c/2567077 caused it to run for
other UI modes as well. This CL partially reverts the changes
in the CL and let the root ui coordinator for tabbed mode
handle the initialization again.

Bug: 1154485, 1142286, 1154582
Change-Id: I834958fd6d3e620d928064a800c2499bb0deba6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2569435Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833846}

chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

@@ -55,6 +55,7 @@ import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.toolbar.ToolbarButtonInProductHelpController;
 import org.chromium.chrome.browser.ui.RootUiCoordinator;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
@@ -249,6 +250,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
             mEmptyBackgroundViewWrapper.initialize();
         }
 
+        if (!mActivity.isTablet()
+                && (TabUiFeatureUtilities.isTabGroupsAndroidEnabled()
+                        || TabUiFeatureUtilities.isConditionalTabStripEnabled())) {
+            getToolbarManager().enableBottomControls();
+        }
+
         if (EphemeralTabCoordinator.isSupported()) {
             mEphemeralTabCoordinatorSupplier.set(new EphemeralTabCoordinator(mActivity,
                     mActivity.getWindowAndroid(), mActivity.getWindow().getDecorView(),

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -88,7 +88,6 @@ import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil;
-import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
 import org.chromium.chrome.browser.toolbar.ThemeColorProvider.TintObserver;
 import org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator;
@@ -977,7 +976,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
     /**
      * Enable the bottom controls.
      */
-    private void enableBottomControls() {
+    public void enableBottomControls() {
         mBottomControlsCoordinatorSupplier.set(
                 new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager,
                         mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@@ -1052,12 +1051,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
         // init directly.
         mMenuButtonCoordinator.onNativeInitialized();
 
-        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)
-                && (TabUiFeatureUtilities.isTabGroupsAndroidEnabled()
-                        || TabUiFeatureUtilities.isConditionalTabStripEnabled())) {
-            enableBottomControls();
-        }
-
         TemplateUrlServiceFactory.get().runWhenLoaded(this::registerTemplateUrlObserver);
         mInitializedWithNative = true;
         mTabModelSelector.addObserver(mTabModelSelectorObserver);