| 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 d1a21d26565608391b5c25db9e5ae2636fffe64b..d31323398f1453f1b3c9d65a1bb076ef522af0ea 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
|
| @@ -331,7 +331,16 @@ public class ImeTest extends ContentShellTestBase {
|
| assertWaitForKeyboardStatus(false);
|
| DOMUtils.focusNode(mWebContents, "textarea");
|
| assertWaitForKeyboardStatus(true);
|
| - Thread.sleep(50);
|
| + assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
|
| + @Override
|
| + public boolean isSatisfied() {
|
| + try {
|
| + return "textarea".equals(DOMUtils.getFocusedNode(mWebContents));
|
| + } catch (Exception e) {
|
| + return false;
|
| + }
|
| + }
|
| + }));
|
|
|
| mConnection = (TestAdapterInputConnection) getAdapterInputConnection();
|
| waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 0, "", 0, 0, -1, -1);
|
| @@ -623,6 +632,16 @@ public class ImeTest extends ContentShellTestBase {
|
| assertWaitForKeyboardStatus(false);
|
| DOMUtils.focusNode(mWebContents, "textarea");
|
| assertWaitForKeyboardStatus(true);
|
| + assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
|
| + @Override
|
| + public boolean isSatisfied() {
|
| + try {
|
| + return "textarea".equals(DOMUtils.getFocusedNode(mWebContents));
|
| + } catch (Exception e) {
|
| + return false;
|
| + }
|
| + }
|
| + }));
|
|
|
| mConnection = (TestAdapterInputConnection) getAdapterInputConnection();
|
| waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 0, "", 0, 0, -1, -1);
|
|
|