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 2b8d5233ad5fb1f4fd71c751a0905864c0b137fe..7a89bab7063480538c08f51b9d289753e7b2f4c7 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
@@ -72,17 +72,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);
@@ -156,6 +156,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() {