chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java ('k') | chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

index 4b912ff6ef94532839d04ecb8a0c044228c5e5bd..daff9fdfd7f6a909dbb0eba3c4fce50303f6e11b 100644

--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

@@ -204,7 +204,7 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {

protected void clearServerData() throws InterruptedException {

mFakeServerHelper.clearServerData();

SyncTestUtil.triggerSync();

- CriteriaHelper.pollForUIThreadCriteria(new Criteria("Timed out waiting for sync to stop.") {

+ CriteriaHelper.pollUiThread(new Criteria("Timed out waiting for sync to stop.") {

@Override

public boolean isSatisfied() {

return !ProfileSyncService.get().isSyncRequested();

@@ -224,7 +224,8 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {

});

}

- protected void pollForCriteria(Criteria criteria) throws InterruptedException {

- CriteriaHelper.pollForCriteria(criteria, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);

+ protected void pollInstrumentationThread(Criteria criteria) throws InterruptedException {

+ CriteriaHelper.pollInstrumentationThread(

+ criteria, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);

}