| Index: chrome/browser/sync/test/integration/migration_watcher.cc
|
| diff --git a/chrome/browser/sync/test/integration/migration_watcher.cc b/chrome/browser/sync/test/integration/migration_watcher.cc
|
| index d4379559a6c5d9a668bd3df29a6afc8db9ee368f..ab27c4e8169cd0ed3502c64aaf74d79a44cca2bc 100644
|
| --- a/chrome/browser/sync/test/integration/migration_watcher.cc
|
| +++ b/chrome/browser/sync/test/integration/migration_watcher.cc
|
| @@ -10,7 +10,7 @@
|
|
|
| MigrationWatcher::MigrationWatcher(ProfileSyncServiceHarness* harness)
|
| : harness_(harness), migration_waiter_(NULL) {
|
| - browser_sync::BackendMigrator* migrator =
|
| + syncer::BackendMigrator* migrator =
|
| harness_->service()->GetBackendMigratorForTest();
|
| // PSS must have a migrator after sync is setup and initial data type
|
| // configuration is complete.
|
| @@ -22,9 +22,9 @@ MigrationWatcher::~MigrationWatcher() {
|
| }
|
|
|
| bool MigrationWatcher::HasPendingBackendMigration() const {
|
| - browser_sync::BackendMigrator* migrator =
|
| + syncer::BackendMigrator* migrator =
|
| harness_->service()->GetBackendMigratorForTest();
|
| - return migrator && migrator->state() != browser_sync::BackendMigrator::IDLE;
|
| + return migrator && migrator->state() != syncer::BackendMigrator::IDLE;
|
| }
|
|
|
| syncer::ModelTypeSet MigrationWatcher::GetMigratedTypes() const {
|
|
|