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

chrome/browser/sync/profile_sync_service_harness.h

Index: chrome/browser/sync/profile_sync_service_harness.h
diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h
index 4b17ca0e3c7233b89f46a1baeb8ffdb6c9970b5a..9eac2c1aace4649fc7ec0d5d9b68c18bce09cb50 100644
--- a/chrome/browser/sync/profile_sync_service_harness.h
+++ b/chrome/browser/sync/profile_sync_service_harness.h
@@ -59,7 +59,7 @@ class ProfileSyncServiceHarness
 
   // Same as the above method, but enables sync only for the datatypes contained
   // in |synced_datatypes|.
-  bool SetupSync(syncable::ModelTypeSet synced_datatypes);
+  bool SetupSync(syncer::ModelTypeSet synced_datatypes);
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
@@ -102,7 +102,7 @@ class ProfileSyncServiceHarness
   bool AwaitActionableError();
 
   // Blocks until the given set of data types are migrated.
-  bool AwaitMigration(syncable::ModelTypeSet expected_migrated_types);
+  bool AwaitMigration(syncer::ModelTypeSet expected_migrated_types);
 
   // Blocks the caller until this harness has observed that the sync engine
   // has downloaded all the changes seen by the |partner| harness's client.
@@ -149,10 +149,10 @@ class ProfileSyncServiceHarness
   bool ServiceIsPushingChanges() { return service_->ShouldPushChanges(); }
 
   // Enables sync for a particular sync datatype. Returns true on success.
-  bool EnableSyncForDatatype(syncable::ModelType datatype);
+  bool EnableSyncForDatatype(syncer::ModelType datatype);
 
   // Disables sync for a particular sync datatype. Returns true on success.
-  bool DisableSyncForDatatype(syncable::ModelType datatype);
+  bool DisableSyncForDatatype(syncer::ModelType datatype);
 
   // Enables sync for all sync datatypes. Returns true on success.
   bool EnableSyncForAllDatatypes();
@@ -168,22 +168,22 @@ class ProfileSyncServiceHarness
   // PostCondition:
   //   returns: True if |type| was encrypted and we are fully synced.
   //            False if we timed out.
-  bool EnableEncryptionForType(syncable::ModelType type);
+  bool EnableEncryptionForType(syncer::ModelType type);
 
   // Wait until |type| is encrypted or we time out.
   // PostCondition:
   //   returns: True if |type| is currently encrypted and we are fully synced.
   //            False if we timed out.
-  bool WaitForTypeEncryption(syncable::ModelType type);
+  bool WaitForTypeEncryption(syncer::ModelType type);
 
   // Check if |type| is encrypted.
-  bool IsTypeEncrypted(syncable::ModelType type);
+  bool IsTypeEncrypted(syncer::ModelType type);
 
   // Check if |type| is registered and the controller is running.
-  bool IsTypeRunning(syncable::ModelType type);
+  bool IsTypeRunning(syncer::ModelType type);
 
   // Check if |type| is being synced.
-  bool IsTypePreferred(syncable::ModelType type);
+  bool IsTypePreferred(syncer::ModelType type);
 
   // Get the number of sync entries this client has. This includes all top
   // level or permanent items, and can include recently deleted entries.
@@ -317,14 +317,14 @@ class ProfileSyncServiceHarness
 
   // Gets the current progress indicator of the current sync session
   // for a particular datatype.
-  std::string GetUpdatedTimestamp(syncable::ModelType model_type);
+  std::string GetUpdatedTimestamp(syncer::ModelType model_type);
 
   // Gets detailed status from |service_| in pretty-printable form.
   std::string GetServiceStatus();
 
   // When in WAITING_FOR_ENCRYPTION state, we check to see if this type is now
   // encrypted to determine if we're done.
-  syncable::ModelType waiting_for_encryption_type_;
+  syncer::ModelType waiting_for_encryption_type_;
 
   // The WaitState in which the sync client currently is. Helps determine what
   // action to take when RunStateChangeMachine() is called.
@@ -346,11 +346,11 @@ class ProfileSyncServiceHarness
 
   // The current set of data types pending migration.  Used by
   // AwaitMigration().
-  syncable::ModelTypeSet pending_migration_types_;
+  syncer::ModelTypeSet pending_migration_types_;
 
   // The set of data types that have undergone migration.  Used by
   // AwaitMigration().
-  syncable::ModelTypeSet migrated_types_;
+  syncer::ModelTypeSet migrated_types_;
 
   // Used for logging.
   const std::string profile_debug_name_;