Avoid SYNC_CYCLE_CONTINUATION sync cycles

chrome/browser/sync/test/integration/migration_errors_test.cc

Index: chrome/browser/sync/test/integration/migration_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index d605e80cc1dc87fa0cbd394fa2fa87529054838d..2d117119eb85c99bc20fc525ff704c6bd0135ccc 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -171,7 +171,13 @@ class MigrationTest : public SyncTest {
     }
 
     // Phase 3: Wait for all clients to catch up.
-    ASSERT_TRUE(AwaitQuiescence());
+    //
+    // AwaitQuiescence() will not succeed when notifications are disabled.  We

[akalin, 2012/01/20 22:41:51]

Why is this true?  It seems to me that a single client should be trivially
"quiesced" already.

[rlarocque, 2012/01/20 23:04:56]

Not according to the definition in the integration tests.  It requires that all
clients be "IsFullySynced()", which won't happen automatically when there are no
self-notifications or SYNC_CYCLE_CONTINUATION GetUpdates.

I would like to fix this by relaxing the constraints for AwaitQuiescense(), but
that would break other tests that rely on comparison of timestamps.  In general,
we can't expect timestamps to match unless this clients being compared are both
IsFullySynced().

[akalin, 2012/01/20 23:07:24]

Add TODO to change this back and refer to bug.

+    // can safely avoid calling it because we know that, in the single client
+    // case, there is no one else to wait for.
+    if (!do_test_without_notifications) {
+      AwaitQuiescence();
+    }
 
     // Re-enable notifications if we disabled it.
     if (do_test_without_notifications) {