chrome/android/javatests/src/org/chromium/chrome/browser/ChromeTabbedActivityLollipopAndAboveTest.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/ChromeTabbedActivityLollipopAndAboveTest.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/BluetoothChooserDialogTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.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/ChromeTabbedActivityLollipopAndAboveTest.java

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

index dd0498603d28514f4394f3d4b1c92aea1f40cce3..d9056505f3f3dd711c3238076ec82012ab1f1f31 100644

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

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

@@ -41,7 +41,7 @@ public class ChromeTabbedActivityLollipopAndAboveTest extends ChromeTabbedActivi

// Make sure that ChromeTabbedActivity started up.

Context context = getInstrumentation().getTargetContext();

assertFalse(FeatureUtilities.isDocumentMode(context));

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();

@@ -67,7 +67,7 @@ public class ChromeTabbedActivityLollipopAndAboveTest extends ChromeTabbedActivi

getInstrumentation(), DocumentActivity.class, runnable);

// ApplicationStatus should note that the DocumentActivity isn't running anymore.

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

List<WeakReference<Activity>> activities = ApplicationStatus.getRunningActivities();