Make ViewRoot the top of the ViewAndroid tree

content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java

Index: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
index 46396eda086ac8954f5f8206d2ec0a57426081fc..0580280aa76df790a3f1dc408b65e3fa349fd069 100644
--- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
+++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
@@ -25,6 +25,7 @@ import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
 import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.ViewRoot;
 
 /**
  * Test activity used for verifying the different configuration options for the ContentLinker.
@@ -49,6 +50,7 @@ public class ChromiumLinkerTestActivity extends Activity {
     private static final String USE_LEGACY_LINKER = "--use-linker=legacy";
 
     private ShellManager mShellManager;
+    private ViewRoot mViewRoot;
     private ActivityWindowAndroid mWindowAndroid;
 
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
@@ -134,7 +136,8 @@ public class ChromiumLinkerTestActivity extends Activity {
         View view = inflater.inflate(R.layout.test_activity, null);
         mShellManager = (ShellManager) view.findViewById(R.id.shell_container);
         mWindowAndroid = new ActivityWindowAndroid(this);
-        mShellManager.setWindow(mWindowAndroid);
+        mViewRoot = ViewRoot.create(mWindowAndroid);
+        mShellManager.setViewRoot(mViewRoot);
 
         mShellManager.setStartupUrl("about:blank");
 
@@ -204,6 +207,13 @@ public class ChromiumLinkerTestActivity extends Activity {
     }
 
     @Override
+    protected void onDestroy() {
+        mViewRoot.destroy();
+        mWindowAndroid.destroy();
+        super.onDestroy();
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         mWindowAndroid.onActivityResult(requestCode, resultCode, data);