Factor out ContentViewAndroidDelegate

content/shell/android/java/src/org/chromium/content_shell/Shell.java

Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
index 74ec6ab8c93e381e6ab8110c358df86352c05d81..4c03452b43d3cbab673819ac123cc490ee41a01a 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
@@ -29,6 +29,7 @@ import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
@@ -288,7 +289,20 @@ public class Shell extends LinearLayout {
         Context context = getContext();
         mContentViewCore = new ContentViewCore(context);
         ContentView cv = ContentView.createContentView(context, mContentViewCore);
-        mContentViewCore.initialize(cv, cv, webContents, mWindow);
+        mContentViewCore.initialize(cv,
+                new ViewAndroidDelegate() {
+                    private ViewGroup mContainerView;
+
+                    private ViewAndroidDelegate init(ViewGroup containerView) {
+                        mContainerView = containerView;
+                        return this;
+                    }
+
+                    @Override
+                    public ViewGroup getContainerView() {
+                        return mContainerView;
+                    }
+                }.init(cv), cv, webContents, mWindow);
         mContentViewCore.setContentViewClient(mContentViewClient);
         mWebContents = mContentViewCore.getWebContents();
         mNavigationController = mWebContents.getNavigationController();