| Index: chrome/browser/sync/backend_migrator.h
|
| diff --git a/chrome/browser/sync/backend_migrator.h b/chrome/browser/sync/backend_migrator.h
|
| index ad341323f049bc5683ec0fd6524234f91ffe879d..ee040f04b27f6c8f47a2e5465bab9b6741519563 100644
|
| --- a/chrome/browser/sync/backend_migrator.h
|
| +++ b/chrome/browser/sync/backend_migrator.h
|
| @@ -55,7 +55,7 @@ class BackendMigrator : public content::NotificationObserver {
|
| virtual ~BackendMigrator();
|
|
|
| // Starts a sequence of events that will disable and reenable |types|.
|
| - void MigrateTypes(syncable::ModelEnumSet types);
|
| + void MigrateTypes(syncable::ModelTypeSet types);
|
|
|
| void AddMigrationObserver(MigrationObserver* observer);
|
| bool HasMigrationObserver(MigrationObserver* observer) const;
|
| @@ -69,7 +69,7 @@ class BackendMigrator : public content::NotificationObserver {
|
| State state() const;
|
|
|
| // Returns the types that are currently pending migration (if any).
|
| - syncable::ModelEnumSet GetPendingMigrationTypesForTest() const;
|
| + syncable::ModelTypeSet GetPendingMigrationTypesForTest() const;
|
|
|
| private:
|
| void ChangeState(State new_state);
|
| @@ -97,7 +97,7 @@ class BackendMigrator : public content::NotificationObserver {
|
|
|
| ObserverList<MigrationObserver> migration_observers_;
|
|
|
| - syncable::ModelEnumSet to_migrate_;
|
| + syncable::ModelTypeSet to_migrate_;
|
|
|
| base::WeakPtrFactory<BackendMigrator> weak_ptr_factory_;
|
|
|
|
|