Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java

Issue 1282603005: Convert ChromeSyncShell to use ChromePublic infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-land version Created 5 years, 4 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 | « sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
index b467d26753a290658f204d6763b7d792c4f10501..26b9db574b28c5a32f93c80d72773d6b0c1ff653 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
+++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
@@ -14,6 +14,7 @@ import android.os.Bundle;
import junit.framework.Assert;
import org.chromium.base.ThreadUtils;
+import org.chromium.base.VisibleForTesting;
import org.chromium.sync.SyncContentResolverDelegate;
import java.util.HashMap;
@@ -70,6 +71,7 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
}
@Override
+ @VisibleForTesting
public void setMasterSyncAutomatically(boolean sync) {
if (mMasterSyncAutomatically == sync) return;
@@ -170,6 +172,7 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
*
* @throws InterruptedException
*/
+ @VisibleForTesting
public void waitForLastNotificationCompleted() throws InterruptedException {
Assert.assertTrue("Timed out waiting for notifications to complete.",
mPendingObserverCount.tryAcquire(5, TimeUnit.SECONDS));
« no previous file with comments | « sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698