Index: components/sync/driver/backend_migrator.h |
diff --git a/components/sync_driver/backend_migrator.h b/components/sync/driver/backend_migrator.h |
similarity index 84% |
rename from components/sync_driver/backend_migrator.h |
rename to components/sync/driver/backend_migrator.h |
index 3fc2e3e990fb8e621d200e2a89a131182c15e017..38a03be6e93d79398506b65849a46ae6b2d7e1bf 100644 |
--- a/components/sync_driver/backend_migrator.h |
+++ b/components/sync/driver/backend_migrator.h |
@@ -12,7 +12,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
#include "components/sync/base/model_type.h" |
-#include "components/sync_driver/data_type_manager.h" |
+#include "components/sync/driver/data_type_manager.h" |
namespace syncer { |
struct UserShare; |
@@ -40,13 +40,13 @@ class BackendMigrator { |
public: |
enum State { |
IDLE, |
- WAITING_TO_START, // Waiting for previous configuration to finish. |
- DISABLING_TYPES, // Exit criteria: SYNC_CONFIGURE_DONE for |
- // enabled types _excluding_ |to_migrate_| and |
- // empty download progress markers for types |
- // in |to_migrate_|. |
- REENABLING_TYPES, // Exit criteria: SYNC_CONFIGURE_DONE for enabled |
- // types. |
+ WAITING_TO_START, // Waiting for previous configuration to finish. |
+ DISABLING_TYPES, // Exit criteria: SYNC_CONFIGURE_DONE for |
+ // enabled types _excluding_ |to_migrate_| and |
+ // empty download progress markers for types |
+ // in |to_migrate_|. |
+ REENABLING_TYPES, // Exit criteria: SYNC_CONFIGURE_DONE for enabled |
+ // types. |
}; |
// TODO(akalin): Remove the dependency on |user_share|. |
@@ -54,7 +54,7 @@ class BackendMigrator { |
syncer::UserShare* user_share, |
sync_driver::SyncService* service, |
sync_driver::DataTypeManager* manager, |
- const base::Closure &migration_done_callback); |
+ const base::Closure& migration_done_callback); |
virtual ~BackendMigrator(); |
// Starts a sequence of events that will disable and reenable |types|. |