chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.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/customtabs/CustomTabActivityTestBase.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/customtabs/CustomTabActivityTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.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/customtabs/CustomTabActivityTestBase.java

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

index 181276cf8455d4a526e1014e333a9a8f209ae0d3..0f690d719a5b4766051506001d45afccf5f06bc0 100644

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

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

@@ -51,7 +51,7 @@ public abstract class CustomTabActivityTestBase extends

protected void startCustomTabActivityWithIntent(Intent intent) throws InterruptedException {

startActivityCompletely(intent);

- CriteriaHelper.pollForUIThreadCriteria(new Criteria("Tab never selected/initialized.") {

+ CriteriaHelper.pollUiThread(new Criteria("Tab never selected/initialized.") {

@Override

public boolean isSatisfied() {

return getActivity().getActivityTab() != null;

@@ -70,7 +70,7 @@ public abstract class CustomTabActivityTestBase extends

} catch (TimeoutException e) {

fail();

}

- CriteriaHelper.pollForUIThreadCriteria(new Criteria("Deferred startup never completed") {

+ CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") {

@Override

public boolean isSatisfied() {

return DeferredStartupHandler.getInstance().isDeferredStartupComplete();