[Sync] Move ModelType and related classes to 'syncer' namespace

chrome/browser/sync/backend_migrator.cc

Index: chrome/browser/sync/backend_migrator.cc
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc
index e15dcbb5cf843a083051544ae262ebd950718310..72e711c60630011faa2982082b6d75646017a1d3 100644
--- a/chrome/browser/sync/backend_migrator.cc
+++ b/chrome/browser/sync/backend_migrator.cc
@@ -16,11 +16,11 @@
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/directory.h" // TODO(tim): Bug 131130.
 
-using syncable::ModelTypeSet;
+using syncer::ModelTypeSet;
 
 namespace browser_sync {
 
-using syncable::ModelTypeToString;
+using syncer::ModelTypeToString;
 
 MigrationObserver::~MigrationObserver() {}
 
@@ -45,7 +45,7 @@ BackendMigrator::~BackendMigrator() {
 
 #define SDVLOG(verbose_level) DVLOG(verbose_level) << name_ << ": "
 
-void BackendMigrator::MigrateTypes(syncable::ModelTypeSet types) {
+void BackendMigrator::MigrateTypes(syncer::ModelTypeSet types) {
   const ModelTypeSet old_to_migrate = to_migrate_;
   to_migrate_.PutAll(types);
   SDVLOG(1) << "MigrateTypes called with " << ModelTypeSetToString(types)
@@ -103,7 +103,7 @@ void BackendMigrator::RestartMigration() {
   ChangeState(DISABLING_TYPES);
   const ModelTypeSet full_set = service_->GetPreferredDataTypes();
   const ModelTypeSet difference = Difference(full_set, to_migrate_);
-  bool configure_with_nigori = !to_migrate_.Has(syncable::NIGORI);
+  bool configure_with_nigori = !to_migrate_.Has(syncer::NIGORI);
   SDVLOG(1) << "BackendMigrator disabling types "
             << ModelTypeSetToString(to_migrate_) << "; configuring "
             << ModelTypeSetToString(difference)
@@ -135,12 +135,12 @@ void BackendMigrator::OnConfigureDone(
 
 namespace {
 
-syncable::ModelTypeSet GetUnsyncedDataTypes(syncer::UserShare* user_share) {
+syncer::ModelTypeSet GetUnsyncedDataTypes(syncer::UserShare* user_share) {
   syncer::ReadTransaction trans(FROM_HERE, user_share);
-  syncable::ModelTypeSet unsynced_data_types;
-  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    syncable::ModelType type = syncable::ModelTypeFromInt(i);
+  syncer::ModelTypeSet unsynced_data_types;
+  for (int i = syncer::FIRST_REAL_MODEL_TYPE;
+       i < syncer::MODEL_TYPE_COUNT; ++i) {
+    syncer::ModelType type = syncer::ModelTypeFromInt(i);
     sync_pb::DataTypeProgressMarker progress_marker;
     trans.GetDirectory()->GetDownloadProgress(type, &progress_marker);
     if (progress_marker.token().empty()) {
@@ -191,13 +191,13 @@ void BackendMigrator::OnConfigureDoneImpl(
   }
 
   if (state_ == DISABLING_TYPES) {
-    const syncable::ModelTypeSet unsynced_types =
+    const syncer::ModelTypeSet unsynced_types =
         GetUnsyncedDataTypes(user_share_);
     if (!unsynced_types.HasAll(to_migrate_)) {
       SLOG(WARNING) << "Set of unsynced types: "
-                    << syncable::ModelTypeSetToString(unsynced_types)
+                    << syncer::ModelTypeSetToString(unsynced_types)
                     << " does not contain types to migrate: "
-                    << syncable::ModelTypeSetToString(to_migrate_)
+                    << syncer::ModelTypeSetToString(to_migrate_)
                     << "; not re-enabling yet";
       return;
     }
@@ -207,14 +207,14 @@ void BackendMigrator::OnConfigureDoneImpl(
     // may have chosen to disable types during the migration.
     const ModelTypeSet full_set = service_->GetPreferredDataTypes();
     SDVLOG(1) << "BackendMigrator re-enabling types: "
-              << syncable::ModelTypeSetToString(full_set);
+              << syncer::ModelTypeSetToString(full_set);
     manager_->Configure(full_set, syncer::CONFIGURE_REASON_MIGRATION);
   } else if (state_ == REENABLING_TYPES) {
     // We're done!
     ChangeState(IDLE);
 
     SDVLOG(1) << "BackendMigrator: Migration complete for: "
-              << syncable::ModelTypeSetToString(to_migrate_);
+              << syncer::ModelTypeSetToString(to_migrate_);
     to_migrate_.Clear();
 
     if (!migration_done_callback_.is_null())
@@ -226,8 +226,7 @@ BackendMigrator::State BackendMigrator::state() const {
   return state_;
 }
 
-syncable::ModelTypeSet
-    BackendMigrator::GetPendingMigrationTypesForTest() const {
+syncer::ModelTypeSet BackendMigrator::GetPendingMigrationTypesForTest() const {
   return to_migrate_;
 }