chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java - Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and update MediaRouterIntegrationTest.java Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

index e49afef00b47d195a8001366d05cefe93abfa41a..e06964fdbfc7054b6a62b8b2311ceea28d8510ec 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

@@ -54,7 +54,7 @@ public class FocusedEditableTextFieldZoomTest extends ChromeActivityTestCaseBase

// level via the viewport tag and waiting for the zoom level to reach that value before we

// proceed with the rest of the test.

final ContentViewCore contentViewCore = getActivity().getActivityTab().getContentViewCore();

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

return contentViewCore.getScale() - INITIAL_SCALE < FLOAT_DELTA;

@@ -64,7 +64,7 @@ public class FocusedEditableTextFieldZoomTest extends ChromeActivityTestCaseBase

private void waitForZoomIn(final ContentViewCore contentViewCore, final float initialZoomLevel)

throws InterruptedException {

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

return contentViewCore.getScale() > initialZoomLevel;

@@ -110,7 +110,7 @@ public class FocusedEditableTextFieldZoomTest extends ChromeActivityTestCaseBase

KeyUtils.singleKeyEventView(getInstrumentation(), tab.getView(), KeyEvent.KEYCODE_BACK);

// We should zoom out to the previous zoom level.

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

return (contentViewCore.getScale() - initialZoomLevel) < FLOAT_DELTA;