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

chrome/browser/sync/test/integration/enable_disable_test.cc

Index: chrome/browser/sync/test/integration/enable_disable_test.cc
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index ef2b5a2fcfdab7b11f097a7aef282eb8f75dda2f..09150564eab398bb1e877147241a15b8c775b309 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -31,10 +31,10 @@ class EnableDisableSingleClientTest : public EnableDisableTest {
 };
 
 bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
-                           syncable::ModelType type) {
+                           syncer::ModelType type) {
     syncer::ReadTransaction trans(FROM_HERE, user_share);
     syncer::ReadNode node(&trans);
-    return node.InitByTagLookup(syncable::ModelTypeToRootTag(type)) ==
+    return node.InitByTagLookup(syncer::ModelTypeToRootTag(type)) ==
         syncer::BaseNode::INIT_OK;
 }
 
@@ -42,32 +42,32 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no enabled types.
-  ASSERT_TRUE(GetClient(0)->SetupSync(syncable::ModelTypeSet()));
+  ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
 
   // TODO(rlarocque, 97780): It should be possible to disable notifications
   // before calling SetupSync().  We should move this line back to the top
   // of this function when this is supported.
   DisableNotifications();
 
-  const syncable::ModelTypeSet registered_types =
+  const syncer::ModelTypeSet registered_types =
       GetClient(0)->service()->GetRegisteredDataTypes();
   syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();
-  for (syncable::ModelTypeSet::Iterator it = registered_types.First();
+  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncable::AUTOFILL_PROFILE) {
+    if (it.Get() == syncer::AUTOFILL_PROFILE) {
       continue;
     }
 
     ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()))
-        << syncable::ModelTypeToString(it.Get());
+        << syncer::ModelTypeToString(it.Get());
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncable::AUTOFILL) {
+    if (it.Get() == syncer::AUTOFILL) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
-                                        syncable::AUTOFILL_PROFILE));
+                                        syncer::AUTOFILL_PROFILE));
     }
   }
 
@@ -85,23 +85,23 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   // of this function when this is supported.
   DisableNotifications();
 
-  const syncable::ModelTypeSet registered_types =
+  const syncer::ModelTypeSet registered_types =
       GetClient(0)->service()->GetRegisteredDataTypes();
 
   syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();
 
   // Make sure all top-level nodes exist first.
-  for (syncable::ModelTypeSet::Iterator it = registered_types.First();
+  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
   }
 
-  for (syncable::ModelTypeSet::Iterator it = registered_types.First();
+  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncable::AUTOFILL_PROFILE) {
+    if (it.Get() == syncer::AUTOFILL_PROFILE) {
       continue;
     }
 
@@ -109,12 +109,12 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
         GetClient(0)->service()->GetUserShare();
 
     ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get()))
-        << syncable::ModelTypeToString(it.Get());
+        << syncer::ModelTypeToString(it.Get());
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncable::AUTOFILL) {
+    if (it.Get() == syncer::AUTOFILL) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
-                                         syncable::AUTOFILL_PROFILE));
+                                         syncer::AUTOFILL_PROFILE));
     }
   }