Adding compositor callbacks to RenderWidgetHostViewAndroid

chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
index 5b6753927c2692ba857d3c5453338f3d3467ed9e..7b797e16428a7ef4ac5620ba9f113459a8ba910c 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
@@ -42,19 +42,6 @@ public class TabManager extends LinearLayout {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
-        mContentViewHolder = (ViewGroup) findViewById(R.id.content_container);
-        mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
-        mContentViewRenderView = new ContentViewRenderView(getContext()) {
-            @Override
-            protected void onReadyToRender() {
-                if (mCurrentTab == null) createTab(mStartupUrl);
-            }
-        };
-        mContentViewHolder.addView(mContentViewRenderView,
-                new FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        FrameLayout.LayoutParams.MATCH_PARENT));
     }
 
     /**
@@ -62,6 +49,19 @@ public class TabManager extends LinearLayout {
      */
     public void setWindow(WindowAndroid window) {
         mWindow = window;
+        mContentViewHolder = (ViewGroup) findViewById(R.id.content_container);
+        mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
+        assert mWindow != null;
+        mContentViewRenderView = new ContentViewRenderView(getContext(), mWindow) {
+                @Override
+                    protected void onReadyToRender() {
+                    if (mCurrentTab == null) createTab(mStartupUrl);
+                }
+            };
+        mContentViewHolder.addView(mContentViewRenderView,
+                new FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.MATCH_PARENT));
     }
 
     /**