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

Previously they were in 'syncer::syncable'.

Also remove aliases to those classes from 'syncable'.

BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,

Review URL: https://chromiumcodereview.appspot.com/10696087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 33 insertions, 34 deletions

diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc
index dd2c268..dd477bc 100644
--- a/chrome/browser/sync/sync_prefs_unittest.cc
+++ b/chrome/browser/sync/sync_prefs_unittest.cc
@@ -27,20 +27,20 @@ class SyncPrefsTest : public testing::Test {
 };
 
 // Get all types with a user-facing component.
-syncable::ModelTypeSet GetNonPassiveTypes() {
-  syncable::ModelTypeSet non_passive_types = syncable::ModelTypeSet::All();
-  non_passive_types.Remove(syncable::NIGORI);
+syncer::ModelTypeSet GetNonPassiveTypes() {
+  syncer::ModelTypeSet non_passive_types = syncer::ModelTypeSet::All();
+  non_passive_types.Remove(syncer::NIGORI);
   return non_passive_types;
 }
 
 // Returns all types visible from the setup UI.
-syncable::ModelTypeSet GetUserVisibleTypes() {
-  syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes());
-  user_visible_types.Remove(syncable::APP_NOTIFICATIONS);
-  user_visible_types.Remove(syncable::APP_SETTINGS);
-  user_visible_types.Remove(syncable::AUTOFILL_PROFILE);
-  user_visible_types.Remove(syncable::EXTENSION_SETTINGS);
-  user_visible_types.Remove(syncable::SEARCH_ENGINES);
+syncer::ModelTypeSet GetUserVisibleTypes() {
+  syncer::ModelTypeSet user_visible_types(GetNonPassiveTypes());
+  user_visible_types.Remove(syncer::APP_NOTIFICATIONS);
+  user_visible_types.Remove(syncer::APP_SETTINGS);
+  user_visible_types.Remove(syncer::AUTOFILL_PROFILE);
+  user_visible_types.Remove(syncer::EXTENSION_SETTINGS);
+  user_visible_types.Remove(syncer::SEARCH_ENGINES);
   return user_visible_types;
 }
 
@@ -78,13 +78,13 @@ TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
 
   EXPECT_TRUE(sync_prefs.HasKeepEverythingSynced());
 
-  const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
+  const syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(non_passive_types.Equals(
       sync_prefs.GetPreferredDataTypes(non_passive_types)));
-  const syncable::ModelTypeSet user_visible_types = GetUserVisibleTypes();
-  for (syncable::ModelTypeSet::Iterator it = user_visible_types.First();
+  const syncer::ModelTypeSet user_visible_types = GetUserVisibleTypes();
+  for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
-    syncable::ModelTypeSet preferred_types;
+    syncer::ModelTypeSet preferred_types;
     preferred_types.Put(it.Get());
     sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
     EXPECT_TRUE(non_passive_types.Equals(
@@ -97,27 +97,27 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
 
   sync_prefs.SetKeepEverythingSynced(false);
 
-  const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
+  const syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(non_passive_types.Equals(
       sync_prefs.GetPreferredDataTypes(non_passive_types)));
-  const syncable::ModelTypeSet user_visible_types = GetUserVisibleTypes();
-  for (syncable::ModelTypeSet::Iterator it = user_visible_types.First();
+  const syncer::ModelTypeSet user_visible_types = GetUserVisibleTypes();
+  for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
-    syncable::ModelTypeSet preferred_types;
+    syncer::ModelTypeSet preferred_types;
     preferred_types.Put(it.Get());
-    syncable::ModelTypeSet expected_preferred_types(preferred_types);
-    if (it.Get() == syncable::AUTOFILL) {
-      expected_preferred_types.Put(syncable::AUTOFILL_PROFILE);
+    syncer::ModelTypeSet expected_preferred_types(preferred_types);
+    if (it.Get() == syncer::AUTOFILL) {
+      expected_preferred_types.Put(syncer::AUTOFILL_PROFILE);
     }
-    if (it.Get() == syncable::PREFERENCES) {
-      expected_preferred_types.Put(syncable::SEARCH_ENGINES);
+    if (it.Get() == syncer::PREFERENCES) {
+      expected_preferred_types.Put(syncer::SEARCH_ENGINES);
     }
-    if (it.Get() == syncable::APPS) {
-      expected_preferred_types.Put(syncable::APP_NOTIFICATIONS);
-      expected_preferred_types.Put(syncable::APP_SETTINGS);
+    if (it.Get() == syncer::APPS) {
+      expected_preferred_types.Put(syncer::APP_NOTIFICATIONS);
+      expected_preferred_types.Put(syncer::APP_SETTINGS);
     }
-    if (it.Get() == syncable::EXTENSIONS) {
-      expected_preferred_types.Put(syncable::EXTENSION_SETTINGS);
+    if (it.Get() == syncer::EXTENSIONS) {
+      expected_preferred_types.Put(syncer::EXTENSION_SETTINGS);
     }
     sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
@@ -153,12 +153,11 @@ TEST_F(SyncPrefsTest, ObservedPrefs) {
 TEST_F(SyncPrefsTest, AcknowledgeSyncedTypes) {
   SyncPrefs sync_prefs(&pref_service_);
 
-  syncable::ModelTypeSet expected_acknowledge_synced_types =
+  syncer::ModelTypeSet expected_acknowledge_synced_types =
       sync_prefs.GetAcknowledgeSyncedTypesForTest();
-  for (int i = syncable::EXTENSION_SETTINGS;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    const syncable::ModelType type = syncable::ModelTypeFromInt(i);
-    syncable::ModelTypeSet acknowledge_synced_types(type);
+  for (int i = syncer::EXTENSION_SETTINGS; i < syncer::MODEL_TYPE_COUNT; ++i) {
+    const syncer::ModelType type = syncer::ModelTypeFromInt(i);
+    syncer::ModelTypeSet acknowledge_synced_types(type);
     expected_acknowledge_synced_types.Put(type);
     sync_prefs.AcknowledgeSyncedTypes(acknowledge_synced_types);
     EXPECT_TRUE(expected_acknowledge_synced_types.Equals(
@@ -195,7 +194,7 @@ TEST_F(SyncPrefsTest, NullPrefService) {
   EXPECT_FALSE(sync_prefs.IsStartSuppressed());
   EXPECT_EQ(base::Time(), sync_prefs.GetLastSyncedTime());
   EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced());
-  const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
+  const syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(non_passive_types).Empty());
   EXPECT_FALSE(sync_prefs.IsManaged());
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());