Inflate toolbar layouts in ControlContainer

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

Index: chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
index 259469832c1adb2c5bbc91cf99390ff723800787..4bda45bf4a703bcb7f2c3d1486bd1856026e6cb9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
@@ -22,6 +22,7 @@ import org.chromium.base.TraceEvent;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.InetAddress;
@@ -69,8 +70,10 @@ public final class WarmupManager {
      * Inflates and constructs the view hierarchy that the app will use.
      * @param baseContext The base context to use for creating the ContextWrapper.
      * @param toolbarContainerId Id of the toolbar container.
+     * @param toolbarId The toolbar's layout ID.
      */
-    public void initializeViewHierarchy(Context baseContext, int toolbarContainerId) {
+    public void initializeViewHierarchy(Context baseContext, int toolbarContainerId,
+            int toolbarId) {
         TraceEvent.begin("WarmupManager.initializeViewHierarchy");
         // Inflating the view hierarchy causes StrictMode violations on some
         // devices. Since layout inflation should happen on the UI thread, allow
@@ -88,7 +91,8 @@ public final class WarmupManager {
             if (toolbarContainerId != ChromeActivity.NO_CONTROL_CONTAINER) {
                 ViewStub stub = (ViewStub) mMainView.findViewById(R.id.control_container_stub);
                 stub.setLayoutResource(toolbarContainerId);
-                stub.inflate();
+                ControlContainer controlContainer = (ControlContainer) stub.inflate();
+                controlContainer.initWithToolbar(toolbarId);
             }
         } catch (InflateException e) {
             // See crbug.com/606715.