Allow ChromeActivity to enable the bottom toolbar via ToolbarManager

Bug: 852406
Change-Id: Iab6fc1125a0af2feed0c2c3d9918591f9b0bd332
Reviewed-on: https://chromium-review.googlesource.com/1099861
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568144}

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -1429,6 +1429,8 @@ public class ChromeTabbedActivity
         super.initializeToolbar();
         if (isTablet()) {
             getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);
+        } else if (FeatureUtilities.isBottomToolbarEnabled()) {
+            getToolbarManager().enableBottomToolbar();
         }
     }
 

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

@@ -237,11 +237,6 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
 
         HomepageManager.getInstance().addListener(mHomepageStateListener);
 
-        if (FeatureUtilities.isBottomToolbarEnabled()) {
-            mBottomToolbarController = new BottomToolbarController(
-                    mActivity.getFullscreenManager(), mActivity.findViewById(R.id.coordinator));
-        }
-
         mTabModelSelectorObserver = new EmptyTabModelSelectorObserver() {
             @Override
             public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
@@ -600,6 +595,16 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
         mLoadProgressSimulator = new LoadProgressSimulator(this);
     }
 
+    /**
+     * Enable the bottom toolbar.
+     */
+    public void enableBottomToolbar() {
+        if (FeatureUtilities.isBottomToolbarEnabled()) {
+            mBottomToolbarController = new BottomToolbarController(
+                    mActivity.getFullscreenManager(), mActivity.findViewById(R.id.coordinator));
+        }
+    }
+
     /**
      * Show the download page in-product-help bubble. Also used by download page screenshot IPH.
      * @param tab The current tab.