Adding compositor callbacks to RenderWidgetHostViewAndroid

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

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index c5c65af24af6f7124e74e3e8c186be32c2717855..2cb91765236f0bd3478803452a1c9de351900db8 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -71,17 +71,17 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {
     private void finishInitialization(final Bundle savedInstanceState) {
         setContentView(R.layout.testshell_activity);
         mTabManager = (TabManager) findViewById(R.id.tab_manager);
+
+        mWindow = new ActivityWindowAndroid(this);
+        mWindow.restoreInstanceState(savedInstanceState);
+        mTabManager.setWindow(mWindow);
+
         String startupUrl = getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(startupUrl)) {
             mTabManager.setStartupUrl(startupUrl);
         }
         TestShellToolbar mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
         mToolbar.setMenuHandler(this);
-
-        mWindow = new ActivityWindowAndroid(this);
-        mWindow.restoreInstanceState(savedInstanceState);
-        mTabManager.setWindow(mWindow);
-
         mDevToolsServer = new DevToolsServer("chromium_testshell");
         mDevToolsServer.setRemoteDebuggingEnabled(true);
         mSyncController = SyncController.get(this);
@@ -155,6 +155,13 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {
     }
 
     /**
+     * @return The {@link WindowAndroid} associated with this activity.
+     */
+    public WindowAndroid getWindowAndroid() {
+        return mWindow;
+    }
+
+    /**
      * @return The {@link TestShellTab} that is currently visible.
      */
     public TestShellTab getActiveTab() {