Index: chrome/browser/sync/test/integration/migration_test.cc |
diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc |
index a63d0d45be82aad06a96a949b7b4fa23cc1de094..24ddec5b1b5b677fa51f620c2c7f2fd05a7b177d 100644 |
--- a/chrome/browser/sync/test/integration/migration_test.cc |
+++ b/chrome/browser/sync/test/integration/migration_test.cc |
@@ -71,8 +71,7 @@ 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(); |
@@ -98,6 +97,10 @@ class MigrationChecker : public StatusChangeChecker, |
!HasPendingBackendMigration(); |
} |
+ virtual std::string GetDebugMessage() const OVERRIDE { |
+ return "Waiting to migrate (" + ModelTypeSetToString(expected_types_) + ")"; |
+ } |
+ |
bool HasPendingBackendMigration() const { |
browser_sync::BackendMigrator* migrator = |
harness_->service()->GetBackendMigratorForTest(); |
@@ -234,7 +237,7 @@ class MigrationTest : public SyncTest { |
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)); |
} |
} |