| 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..45946cefb9fe6f53f81d1a3af5c4fd397c4a546d 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,7 @@ public class TabModelSelectorObserverTestBase extends NativeLibraryTestBase {
|
| protected TabModelSelectorTestTabModel mNormalTabModel;
|
| protected TabModelSelectorTestTabModel mIncognitoTabModel;
|
|
|
| - protected WindowAndroid mWindowAndroid;
|
| + protected ViewRoot mViewRoot;
|
|
|
| @Override
|
| public void setUp() throws Exception {
|
| @@ -43,8 +44,9 @@ public class TabModelSelectorObserverTestBase extends NativeLibraryTestBase {
|
| }
|
|
|
| private void initialize() {
|
| - mWindowAndroid = new WindowAndroid(
|
| + WindowAndroid windowAndroid = new WindowAndroid(
|
| getInstrumentation().getTargetContext().getApplicationContext());
|
| + mViewRoot = ViewRoot.create(windowAndroid);
|
|
|
| mSelector = new TabModelSelectorBase() {
|
| @Override
|
|
|