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 f852d629c4e341643388b7ba3ed9afa794e63f14..ccafa5b6b1294400de1b500323fccdba4861a868 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,10 +42,17 @@ public class TabManager extends LinearLayout {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
+    }
 
+    /**
+     * @param window The window used to generate all ContentViews.
+     */
+    public void setWindow(WindowAndroid window) {
+        assert window != null;
+        mWindow = window;
         mContentViewHolder = (ViewGroup) findViewById(R.id.content_container);
         mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
-        mContentViewRenderView = new ContentViewRenderView(getContext()) {
+        mContentViewRenderView = new ContentViewRenderView(getContext(), mWindow) {
             @Override
             protected void onReadyToRender() {
                 if (mCurrentTab == null) createTab(mStartupUrl);
@@ -58,13 +65,6 @@ public class TabManager extends LinearLayout {
     }
 
     /**
-     * @param window The window used to generate all ContentViews.
-     */
-    public void setWindow(WindowAndroid window) {
-        mWindow = window;
-    }
-
-    /**
      * @param startupUrl The URL that the first tab should navigate to.
      */
     public void setStartupUrl(String startupUrl) {