Inflate toolbar layouts in ControlContainer

chrome/android/java/res/layout/custom_tabs_toolbar.xml

Index: chrome/android/java/res/layout/custom_tabs_toolbar.xml
diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
index c2d9ce58864d2c079d49909aed27dc14325c71da..32efb4f5a86da876ad14bd3d8c141db59db917d8 100644
--- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml
+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
@@ -5,7 +5,10 @@
 
 <org.chromium.chrome.browser.toolbar.CustomTabToolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:chrome="http://schemas.android.com/apk/res-auto" >
+    xmlns:chrome="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/custom_tabs_control_container_height"

[gone, 2016/10/12 17:37:45]

I don't think layout_width/height values actually have an effect when they're
the root.

[mdjones, 2016/10/12 20:17:14]

Not having these caused an inflation exception, I think it has something to do
with them now being dynamically inflated.

+    android:id="@+id/toolbar" >
     <ImageButton
         android:id="@+id/close_button"
         style="@style/ToolbarButton"