Make ViewRoot the top of the ViewAndroid tree

content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

Index: content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
diff --git a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
index 9b938c9bf9326c3d0b8e96d25afa5ad6fe87ce97..ef31c799c74a58b34d9b97f14045938f0a0d4cd4 100644
--- a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
+++ b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
@@ -16,6 +16,7 @@ import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content_shell.ShellManager;
 import org.chromium.native_test.NativeBrowserTestActivity;
 import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.ViewRoot;
 import org.chromium.ui.base.WindowAndroid;
 
 /** An Activity base class for running browser tests against ContentShell. */
@@ -47,7 +48,7 @@ public abstract class ContentShellBrowserTestActivity extends NativeBrowserTestA
         setContentView(getTestActivityViewId());
         mShellManager = (ShellManager) findViewById(getShellManagerViewId());
         mWindowAndroid = new ActivityWindowAndroid(this);
-        mShellManager.setWindow(mWindowAndroid);
+        mShellManager.setViewRoot(ViewRoot.create(mWindowAndroid));
 
         Window wind = this.getWindow();
         wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);