Fix the false-positive detection of commit errors

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): Rename this file to migration_test.cc.
 
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
@@ skipping 159 matching lines @@
     // complete.  (Multiple migrations may be handled by each
     // migration cycle, but there's no guarantee of that, so we have
     // to trigger each migration individually.)
     for (MigrationList::const_iterator it = migration_list.begin();
          it != migration_list.end(); ++it) {
       TriggerMigration(*it, trigger_method);
       AwaitMigration(*it);
     }
 
     // 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) {
       EnableNotifications();
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationTest);
 };
@@ skipping 253 matching lines @@
 
   // Phase 5: Verify that preferences can still be synchronized.
   VerifyPrefSync();
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 }  // namespace