chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.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/browser/sync/SyncTestUtil.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/browser/contextmenu/ContextMenuUtils.java ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/tabmodel/document/TestInitializationObserver.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/browser/sync/SyncTestUtil.java

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

index 34422d245ac51ce64b29c71fc9b6928e252dfec2..e941241b17bea0b5866dc2b885a4172816cb0dcf 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java

@@ -71,7 +71,7 @@ public final class SyncTestUtil {

public static void triggerSyncAndWaitForCompletion() throws InterruptedException {

final long oldSyncTime = getCurrentSyncTime();

triggerSync();

- CriteriaHelper.pollForCriteria(new Criteria(

+ CriteriaHelper.pollInstrumentationThread(new Criteria(

"Timed out waiting for sync cycle to complete.") {

@Override

public boolean isSatisfied() {

@@ -93,7 +93,7 @@ public final class SyncTestUtil {

* Waits for sync to become active.

public static void waitForSyncActive() throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(new Criteria(

+ CriteriaHelper.pollUiThread(new Criteria(

"Timed out waiting for sync to become active.") {

@Override

public boolean isSatisfied() {