sync: Improve StatusChangeChecker debug strings

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 53 matching lines @@
                        syncer::ModelType type2) {
   return MakeList(MakeSet(type1), MakeSet(type2));
 }
 
 // Helper class that checks if the sync backend has successfully completed
 // migration for a set of data types.
 class MigrationChecker : public StatusChangeChecker,
                          public browser_sync::MigrationObserver {
  public:
   explicit MigrationChecker(ProfileSyncServiceHarness* harness)
-      : StatusChangeChecker("MigrationChecker"),
-        harness_(harness) {
+      : harness_(harness) {
     DCHECK(harness_);
     browser_sync::BackendMigrator* migrator =
         harness_->service()->GetBackendMigratorForTest();
     // PSS must have a migrator after sync is setup and initial data type
     // configuration is complete.
     DCHECK(migrator);
     migrator->AddMigrationObserver(this);
   }
 
   virtual ~MigrationChecker() {}
 
   // Returns true when sync reports that there is no pending migration, and
   // 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 &&
            !HasPendingBackendMigration();
   }
 
+  virtual std::string GetDebugMessage() const OVERRIDE {
+    return "Waiting to migrate (" + ModelTypeSetToString(expected_types_) + ")";
+  }
+
   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;
   }
 
@@ skipping 116 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"));
+        ASSERT_TRUE(GetClient(i)->AwaitStatusChange(checker));
     }
   }
 
   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