Factor out ContentViewAndroidDelegate

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 966e0363b7f4e9df8967fa684490e223d26a2a59..18f581d7dd26dc2482dbf80f40b8b8a9d277d1d3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -111,6 +111,7 @@ import org.chromium.ui.WindowOpenDisposition;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.lang.ref.WeakReference;
@@ -1779,6 +1780,19 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         mIsInitialized = true;
     }
 
+    private static class ChromeViewAndroidDelegate extends ViewAndroidDelegate {
+        private final ViewGroup mContainerView;
+
+        private ChromeViewAndroidDelegate(ViewGroup containerView) {
+            mContainerView = containerView;
+        }
+
+        @Override
+        public ViewGroup getContainerView() {
+            return mContainerView;
+        }
+    };
+
     /**
      * Creates and initializes the {@link ContentViewCore}.
      *
@@ -1790,7 +1804,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         ContentView cv = ContentView.createContentView(mThemedApplicationContext, cvc);
         cv.setContentDescription(mThemedApplicationContext.getResources().getString(
                 R.string.accessibility_content_view));
-        cvc.initialize(cv, cv, webContents, getWindowAndroid());
+        cvc.initialize(cv, new ChromeViewAndroidDelegate(cv), cv, webContents, getWindowAndroid());
         setContentViewCore(cvc);
         if (getTabModelSelector() instanceof SingleTabModelSelector) {
             getContentViewCore().setFullscreenRequiredForOrientationLock(false);
@@ -2466,7 +2480,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         ContentView cv = ContentView.createContentView(mThemedApplicationContext, cvc);
         cv.setContentDescription(mThemedApplicationContext.getResources().getString(
                 R.string.accessibility_content_view));
-        cvc.initialize(cv, cv, webContents, getWindowAndroid());
+        cvc.initialize(cv, new ChromeViewAndroidDelegate(cv), cv, webContents, getWindowAndroid());
         swapContentViewCore(cvc, false, didStartLoad, didFinishLoad);
     }