| Index: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
|
| index 76af25cea2b76103fba3b12ded07952c515599bb..0d005c582516e6724dde67687ca62efe5c224160 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
|
| @@ -4,10 +4,7 @@
|
|
|
| package org.chromium.chrome.browser.input;
|
|
|
| -import android.test.suitebuilder.annotation.LargeTest;
|
| -
|
| import org.chromium.base.test.util.DisabledTest;
|
| -import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.UrlUtils;
|
| import org.chromium.content.browser.ContentView;
|
| import org.chromium.content.browser.input.SelectPopupDialog;
|
| @@ -18,10 +15,9 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
|
| import org.chromium.content.browser.test.util.UiUtils;
|
| import org.chromium.chrome.browser.ContentViewUtil;
|
| import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
|
| +import org.chromium.ui.ActivityWindowAndroid;
|
| import org.chromium.ui.WindowAndroid;
|
|
|
| -import java.util.concurrent.TimeUnit;
|
| -
|
| public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {
|
| private static final int WAIT_TIMEOUT_SECONDS = 2;
|
| private static final String SELECT_URL = UrlUtils.encodeHtmlDataUri(
|
| @@ -77,7 +73,7 @@ public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {
|
| @Override
|
| public void run() {
|
| int nativeWebContents = ContentViewUtil.createNativeWebContents(false);
|
| - WindowAndroid windowAndroid = new WindowAndroid(getActivity());
|
| + WindowAndroid windowAndroid = new ActivityWindowAndroid(getActivity());
|
| ContentView contentView = ContentView.newInstance(
|
| getActivity(), nativeWebContents, windowAndroid);
|
| contentView.destroy();
|
|
|