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

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java

Issue 1414203016: [Sync] Introduce GmsCoreSyncListener. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 5 years, 1 month 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
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 c50ee4af2232b5bc7182ea250271c9feff113db1..9b48687820cf4d77767ef3ddc0d5c861cf7077a7 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
@@ -186,12 +186,9 @@ public final class SyncTestUtil {
}
/**
- * Triggers a sync and waits till it is complete.
+ * Triggers a sync cycle.
*/
- public static void triggerSyncAndWaitForCompletion(final Context context)
- throws InterruptedException {
- final long oldSyncTime = getCurrentSyncTime(context);
- // Request sync.
+ public static void triggerSync() throws InterruptedException {
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -199,6 +196,16 @@ public final class SyncTestUtil {
.requestSyncFromNativeChromeForAllTypes();
}
});
+ }
+
+ /**
+ * Triggers a sync and waits till it is complete.
+ */
+ public static void triggerSyncAndWaitForCompletion(final Context context)
+ throws InterruptedException {
+ final long oldSyncTime = getCurrentSyncTime(context);
+
+ triggerSync();
// Wait till lastSyncedTime > oldSyncTime.
Assert.assertTrue("Timed out waiting for syncing to complete.",

Powered by Google App Engine
This is Rietveld 408576698