diff options
Diffstat (limited to 'chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java')
-rw-r--r-- | chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java index e4c1a5f727f..a12007f3cc8 100644 --- a/chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java +++ b/chromium/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java @@ -61,7 +61,7 @@ public class ImeTest extends ContentShellTestBase { mContentView = getActivity().getActiveContentView(); mCallbackContainer = new TestCallbackHelperContainer(mContentView); // TODO(aurimas) remove this wait once crbug.com/179511 is fixed. - assertWaitForPageScaleFactorMatch(1); + assertWaitForPageScaleFactor(1); DOMUtils.clickNode(this, mContentView, mCallbackContainer, "input_text"); assertWaitForKeyboardStatus(true); @@ -286,6 +286,17 @@ public class ImeTest extends ContentShellTestBase { }); } + + + private void assertWaitForPageScaleFactor(final float scale) throws InterruptedException { + assertTrue(CriteriaHelper.pollForCriteria(new Criteria() { + @Override + public boolean isSatisfied() { + return getContentViewCore().getScale() == scale; + } + })); + } + private void assertWaitForKeyboardStatus(final boolean show) throws InterruptedException { assertTrue(CriteriaHelper.pollForCriteria(new Criteria() { @Override |