| Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| index 44402ca53d71353a66fd6b069de815a7153f0fd5..a7d927c6a45aa9b4ab3c85d46886fafc9113a47f 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| @@ -33,6 +33,7 @@ import org.chromium.base.test.util.RetryOnFailure;
|
| import org.chromium.base.test.util.parameter.Parameter;
|
| import org.chromium.base.test.util.parameter.ParameterizedTest;
|
| import org.chromium.content.browser.ContentViewCore;
|
| +import org.chromium.content.browser.WebActionMode;
|
| import org.chromium.content.browser.test.util.Criteria;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| import org.chromium.content.browser.test.util.DOMUtils;
|
| @@ -80,6 +81,7 @@ public class ImeTest extends ContentShellTestBase {
|
|
|
| private ContentViewCore mContentViewCore;
|
| private WebContents mWebContents;
|
| + private WebActionMode mActionMode;
|
| private TestCallbackHelperContainer mCallbackContainer;
|
| protected TestInputMethodManagerWrapper mInputMethodManagerWrapper;
|
|
|
| @@ -88,6 +90,7 @@ public class ImeTest extends ContentShellTestBase {
|
| super.setUp();
|
| startActivityWithTestUrl(INPUT_FORM_HTML);
|
| mContentViewCore = getContentViewCore();
|
| + mActionMode = mContentViewCore.getActionModeForTesting();
|
| mWebContents = getWebContents();
|
|
|
| mInputMethodManagerWrapper = new TestInputMethodManagerWrapper(mContentViewCore);
|
| @@ -1288,7 +1291,7 @@ public class ImeTest extends ContentShellTestBase {
|
| CriteriaHelper.pollUiThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| - return mContentViewCore.isPastePopupShowing();
|
| + return mActionMode.isPastePopupShowing();
|
| }
|
| });
|
|
|
| @@ -1296,10 +1299,10 @@ public class ImeTest extends ContentShellTestBase {
|
| CriteriaHelper.pollUiThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| - return !mContentViewCore.isPastePopupShowing();
|
| + return !mActionMode.isPastePopupShowing();
|
| }
|
| });
|
| - assertFalse(mContentViewCore.hasInsertion());
|
| + assertFalse(mActionMode.isInsertion());
|
| }
|
|
|
| @SmallTest
|
| @@ -1313,7 +1316,7 @@ public class ImeTest extends ContentShellTestBase {
|
|
|
| setComposingText("h", 1);
|
| assertWaitForSelectActionBarStatus(false);
|
| - assertFalse(mContentViewCore.hasSelection());
|
| + assertFalse(mActionMode.hasSelection());
|
| }
|
|
|
| @SmallTest
|
| @@ -1322,11 +1325,11 @@ public class ImeTest extends ContentShellTestBase {
|
| public void testTextHandlesPreservedWithDpadNavigation() throws Throwable {
|
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text");
|
| assertWaitForSelectActionBarStatus(true);
|
| - assertTrue(mContentViewCore.hasSelection());
|
| + assertTrue(mActionMode.hasSelection());
|
|
|
| dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN));
|
| assertWaitForSelectActionBarStatus(true);
|
| - assertTrue(mContentViewCore.hasSelection());
|
| + assertTrue(mActionMode.hasSelection());
|
| }
|
|
|
| @MediumTest
|
|
|