| Index: components/sync/driver/backend_migrator.h
|
| diff --git a/components/sync/driver/backend_migrator.h b/components/sync/driver/backend_migrator.h
|
| index e277bea0e6f3dfe0e04bd3ca268fbd34b70cbb3e..a5c183e038f4f563e7ff2fbcedf9cb9aab08f9bc 100644
|
| --- a/components/sync/driver/backend_migrator.h
|
| +++ b/components/sync/driver/backend_migrator.h
|
| @@ -15,14 +15,9 @@
|
| #include "components/sync/driver/data_type_manager.h"
|
|
|
| namespace syncer {
|
| -struct UserShare;
|
| -} // namespace syncer
|
|
|
| -namespace sync_driver {
|
| class SyncService;
|
| -}
|
| -
|
| -namespace browser_sync {
|
| +struct UserShare;
|
|
|
| // Interface for anything that wants to know when the migrator's state
|
| // changes.
|
| @@ -51,14 +46,14 @@ class BackendMigrator {
|
|
|
| // TODO(akalin): Remove the dependency on |user_share|.
|
| BackendMigrator(const std::string& name,
|
| - syncer::UserShare* user_share,
|
| - sync_driver::SyncService* service,
|
| - sync_driver::DataTypeManager* manager,
|
| + UserShare* user_share,
|
| + SyncService* service,
|
| + DataTypeManager* manager,
|
| const base::Closure& migration_done_callback);
|
| virtual ~BackendMigrator();
|
|
|
| // Starts a sequence of events that will disable and reenable |types|.
|
| - void MigrateTypes(syncer::ModelTypeSet types);
|
| + void MigrateTypes(ModelTypeSet types);
|
|
|
| void AddMigrationObserver(MigrationObserver* observer);
|
| bool HasMigrationObserver(const MigrationObserver* observer) const;
|
| @@ -68,11 +63,10 @@ class BackendMigrator {
|
|
|
| // Called from ProfileSyncService to notify us of configure done.
|
| // Note: We receive these notifications only when our state is not IDLE.
|
| - void OnConfigureDone(
|
| - const sync_driver::DataTypeManager::ConfigureResult& result);
|
| + void OnConfigureDone(const DataTypeManager::ConfigureResult& result);
|
|
|
| // Returns the types that are currently pending migration (if any).
|
| - syncer::ModelTypeSet GetPendingMigrationTypesForTest() const;
|
| + ModelTypeSet GetPendingMigrationTypesForTest() const;
|
|
|
| private:
|
| void ChangeState(State new_state);
|
| @@ -87,19 +81,18 @@ class BackendMigrator {
|
| void RestartMigration();
|
|
|
| // Called by OnConfigureDone().
|
| - void OnConfigureDoneImpl(
|
| - const sync_driver::DataTypeManager::ConfigureResult& result);
|
| + void OnConfigureDoneImpl(const DataTypeManager::ConfigureResult& result);
|
|
|
| const std::string name_;
|
| - syncer::UserShare* user_share_;
|
| - sync_driver::SyncService* service_;
|
| - sync_driver::DataTypeManager* manager_;
|
| + UserShare* user_share_;
|
| + SyncService* service_;
|
| + DataTypeManager* manager_;
|
|
|
| State state_;
|
|
|
| base::ObserverList<MigrationObserver> migration_observers_;
|
|
|
| - syncer::ModelTypeSet to_migrate_;
|
| + ModelTypeSet to_migrate_;
|
|
|
| base::Closure migration_done_callback_;
|
|
|
| @@ -108,6 +101,6 @@ class BackendMigrator {
|
| DISALLOW_COPY_AND_ASSIGN(BackendMigrator);
|
| };
|
|
|
| -} // namespace browser_sync
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_BACKEND_MIGRATOR_H_
|
|
|