[sync] Eliminate Await*SyncCompletion methods in integration tests

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

 // Copyright (c) 2012 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.
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
@@ skipping 77 matching lines @@
   // migration is complete for all data types in |expected_types_|.
   virtual bool IsExitConditionSatisfied() OVERRIDE {
     DCHECK(!expected_types_.Empty());
     bool all_expected_types_migrated = migrated_types_.HasAll(expected_types_);
     DVLOG(1) << harness_->profile_debug_name() << ": Migrated types "
              << syncer::ModelTypeSetToString(migrated_types_)
              << (all_expected_types_migrated ? " contains " :
                                                " does not contain ")
              << syncer::ModelTypeSetToString(expected_types_);
     return all_expected_types_migrated &&
-           !harness_->HasPendingBackendMigration();
+           !HasPendingBackendMigration();
+  }
+
+  bool HasPendingBackendMigration() const {
+    browser_sync::BackendMigrator* migrator =
+        harness_->service()->GetBackendMigratorForTest();
+    return migrator && migrator->state() != browser_sync::BackendMigrator::IDLE;
   }
 
   void set_expected_types(syncer::ModelTypeSet expected_types) {
     expected_types_ = expected_types;
   }
 
   syncer::ModelTypeSet migrated_types() const {
     return migrated_types_;
   }
 
   virtual void OnMigrationStateChange() OVERRIDE {
-    if (harness_->HasPendingBackendMigration()) {
+    if (HasPendingBackendMigration()) {
       // A new bunch of data types are in the process of being migrated. Merge
       // them into |pending_types_|.
       pending_types_.PutAll(
           harness_->service()->GetBackendMigratorForTest()->
               GetPendingMigrationTypesForTest());
       DVLOG(1) << harness_->profile_debug_name()
                << ": new pending migration types "
                << syncer::ModelTypeSetToString(pending_types_);
     } else {
       // Migration just finished for a bunch of data types. Merge them into
@@ skipping 101 matching lines @@
   }
 
   // Block until all clients have completed migration for the given
   // types.
   void AwaitMigration(syncer::ModelTypeSet migrate_types) {
     for (int i = 0; i < num_clients(); ++i) {
       MigrationChecker* checker = migration_checkers_[i];
       checker->set_expected_types(migrate_types);
       if (!checker->IsExitConditionSatisfied())
         ASSERT_TRUE(GetClient(i)->AwaitStatusChange(checker, "AwaitMigration"));
-      // We must use AwaitDataSyncCompletion rather than the more common
-      // AwaitFullSyncCompletion. As long as crbug.com/97780 is open, we will
-      // rely on self-notifications to ensure that progress markers are updated,
-      // which allows AwaitFullSyncCompletion to return. However, in some
-      // migration tests these notifications are completely disabled, so the
-      // progress markers do not get updated.  This is why we must use the less
-      // strict condition, AwaitDataSyncCompletion.
-      ASSERT_TRUE(GetClient(i)->AwaitDataSyncCompletion());
     }
   }
 
   bool ShouldRunMigrationTest() const {
     if (!ServerSupportsNotificationControl() ||
         !ServerSupportsErrorTriggering()) {
       LOG(WARNING) << "Test skipped in this server environment.";
       return false;
     }
     return true;
@@ skipping 268 matching lines @@
     // Do not add optional datatypes.
   }
 
   virtual ~MigrationReconfigureTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
 };
 
 }  // namespace