chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.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/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.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/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/FullscreenTestUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java

index 1dbee5a55ad0199a99779085591013f8505e8910..709b02196d7169db56cbb27a02a0b30566e05495 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java

@@ -96,7 +96,7 @@ public class ApplicationTestUtils {

/** Waits until Chrome is in the background. */

public static void waitUntilChromeInBackground() throws Exception {

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

int state = ApplicationStatus.getStateForApplication();

@@ -108,7 +108,7 @@ public class ApplicationTestUtils {

/** Waits until Chrome is in the foreground. */

public static void waitUntilChromeInForeground() throws Exception {

- CriteriaHelper.pollForCriteria(

+ CriteriaHelper.pollInstrumentationThread(

Criteria.equals(ApplicationState.HAS_RUNNING_ACTIVITIES, new Callable<Integer>() {

@Override

public Integer call() {

@@ -127,7 +127,7 @@ public class ApplicationTestUtils {

task.finishAndRemoveTask();

}

- CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {

+ CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {

@Override

public Integer call() {

return getNumChromeTasks(context);

@@ -161,7 +161,7 @@ public class ApplicationTestUtils {

public static void assertWaitForPageScaleFactorMatch(final ChromeActivity activity,

final float expectedScale, boolean waitLongerForLoad) throws InterruptedException {

long waitTimeInMs = waitLongerForLoad ? 10000 : CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL;

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

if (activity.getCurrentContentViewCore() == null) return false;