Make ViewRoot the top of the ViewAndroid tree

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java
index 0e2297ad5216f9c36cb8ba94d2710b0564f56c27..e90fd6ec9cb6c3a51a923459425deb6b702258ef 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestBase.java
@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.ui.base.ViewRoot;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.util.HashSet;
@@ -25,7 +26,8 @@ public class TabModelSelectorObserverTestBase extends NativeLibraryTestBase {
     protected TabModelSelectorTestTabModel mNormalTabModel;
     protected TabModelSelectorTestTabModel mIncognitoTabModel;
 
-    protected WindowAndroid mWindowAndroid;
+    protected ViewRoot mViewRoot;
+    private WindowAndroid mWindowAndroid;
 
     @Override
     public void setUp() throws Exception {
@@ -42,9 +44,17 @@ public class TabModelSelectorObserverTestBase extends NativeLibraryTestBase {
         });
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        mViewRoot.destroy();

[boliu, 2017/02/14 16:44:14]

probably should be runOnUiThreadBlocking to match setUp

+        mWindowAndroid.destroy();
+        super.tearDown();
+    }
+
     private void initialize() {
-        mWindowAndroid = new WindowAndroid(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        mWindowAndroid =
+                new WindowAndroid(getInstrumentation().getTargetContext().getApplicationContext());
+        mViewRoot = ViewRoot.create(mWindowAndroid);
 
         mSelector = new TabModelSelectorBase() {
             @Override