Get rid of ToolbarViewResourceFrameLayout

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

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
index e9531ce0e5e8f7ebba249abcd6089da3f9a2115c..8447d126e0dbb11b4e46853c6d431865de163e9b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
@@ -27,14 +27,16 @@ import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.SmoothProgressBar;
 import org.chromium.chrome.browser.widget.TintedImageButton;
+import org.chromium.chrome.browser.widget.ViewResourceFrameLayout;
 import org.chromium.ui.UiUtils;
+import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
 /**
  * Layout class that contains the base shared logic for manipulating the toolbar component. For
  * interaction that are not from Views inside Toolbar hierarchy all interactions should be done
  * through {@link Toolbar} rather than using this class directly.
  */
-abstract class ToolbarLayout extends FrameLayout implements Toolbar {
+abstract class ToolbarLayout extends ViewResourceFrameLayout implements Toolbar {
     protected static final int BACKGROUND_TRANSITION_DURATION_MS = 400;
 
     private Invalidator mInvalidator;
@@ -67,6 +69,7 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
         super(context, attrs);
         mToolbarHeightWithoutShadow = getResources().getDimensionPixelOffset(
                 getToolbarHeightWithoutShadowResId());
+        setInitializedForCapture(false);
     }
 
     @Override
@@ -359,6 +362,11 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
         return true;
     }
 
+    @Override
+    protected ViewResourceAdapter createResourceAdapter() {
+        return new ToolbarViewResourceAdapter((ViewGroup) getParent(), this);
+    }
+
     /**
      * @param attached Whether or not the web content is attached to the view heirarchy.
      */