Fix the false-positive detection of commit errors

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 868e5738e625ac5346dedc2c19195e3b35110183..81e7647eef2be3188ed0550aba7323a0b4da7905 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -177,7 +177,13 @@ class MigrationTest : public SyncTest {
     }
 
     // Phase 3: Wait for all clients to catch up.
-    AwaitQuiescence();
+    //
+    // AwaitQuiescence() will not succeed when notifications are enabled.  We
+    // 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) {