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 76a4a38c1c12a66affc11d2583ecd4c7a66d6205..ee5531b5a856d9189448f11f649d94f697408643 100644 |
--- a/chrome/browser/sync/test/integration/migration_test.cc |
+++ b/chrome/browser/sync/test/integration/migration_test.cc |
@@ -66,7 +66,6 @@ MigrationList MakeList(syncer::ModelType type1, |
return MakeList(MakeSet(type1), MakeSet(type2)); |
} |
- |
class MigrationTest : public SyncTest { |
public: |
explicit MigrationTest(TestType test_type) : SyncTest(test_type) {} |
@@ -160,9 +159,8 @@ class MigrationTest : public SyncTest { |
// types. |
void AwaitMigration(syncer::ModelTypeSet migrate_types) { |
for (int i = 0; i < num_clients(); ++i) { |
- MigrationWaiter waiter(migrate_types, migration_watchers_[i]); |
- waiter.Wait(); |
- ASSERT_FALSE(waiter.TimedOut()); |
+ ASSERT_TRUE( |
+ MigrationWaiter(migrate_types, migration_watchers_[i]).Wait()); |
} |
} |