[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/sync_prefs_unittest.cc

Index: chrome/browser/sync/sync_prefs_unittest.cc
diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc
index 21ceffae2513b5fc96b0b98fcc77c9b445c0fd51..0064137ab582d02e40377720713970def0939d21 100644
--- a/chrome/browser/sync/sync_prefs_unittest.cc
+++ b/chrome/browser/sync/sync_prefs_unittest.cc
@@ -27,15 +27,15 @@ class SyncPrefsTest : public testing::Test {
 };
 
 // Get all types with a user-facing component.
-syncable::ModelEnumSet GetNonPassiveTypes() {
-  syncable::ModelEnumSet non_passive_types = syncable::ModelEnumSet::All();
+syncable::ModelTypeSet GetNonPassiveTypes() {
+  syncable::ModelTypeSet non_passive_types = syncable::ModelTypeSet::All();
   non_passive_types.Remove(syncable::NIGORI);
   return non_passive_types;
 }
 
 // Returns all types visible from the setup UI.
-syncable::ModelEnumSet GetUserVisibleTypes() {
-  syncable::ModelEnumSet user_visible_types(GetNonPassiveTypes());
+syncable::ModelTypeSet GetUserVisibleTypes() {
+  syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes());
   user_visible_types.Remove(syncable::AUTOFILL_PROFILE);
   user_visible_types.Remove(syncable::SEARCH_ENGINES);
   user_visible_types.Remove(syncable::APP_NOTIFICATIONS);
@@ -76,13 +76,13 @@ TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
 
   EXPECT_TRUE(sync_prefs.HasKeepEverythingSynced());
 
-  const syncable::ModelEnumSet non_passive_types = GetNonPassiveTypes();
+  const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(non_passive_types.Equals(
       sync_prefs.GetPreferredDataTypes(non_passive_types)));
-  const syncable::ModelEnumSet user_visible_types = GetUserVisibleTypes();
-  for (syncable::ModelEnumSet::Iterator it = user_visible_types.First();
+  const syncable::ModelTypeSet user_visible_types = GetUserVisibleTypes();
+  for (syncable::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
-    syncable::ModelEnumSet preferred_types;
+    syncable::ModelTypeSet preferred_types;
     preferred_types.Put(it.Get());
     sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
     EXPECT_TRUE(non_passive_types.Equals(
@@ -95,15 +95,15 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
 
   sync_prefs.SetKeepEverythingSynced(false);
 
-  const syncable::ModelEnumSet non_passive_types = GetNonPassiveTypes();
+  const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(non_passive_types.Equals(
       sync_prefs.GetPreferredDataTypes(non_passive_types)));
-  const syncable::ModelEnumSet user_visible_types = GetUserVisibleTypes();
-  for (syncable::ModelEnumSet::Iterator it = user_visible_types.First();
+  const syncable::ModelTypeSet user_visible_types = GetUserVisibleTypes();
+  for (syncable::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
-    syncable::ModelEnumSet preferred_types;
+    syncable::ModelTypeSet preferred_types;
     preferred_types.Put(it.Get());
-    syncable::ModelEnumSet expected_preferred_types(preferred_types);
+    syncable::ModelTypeSet expected_preferred_types(preferred_types);
     if (it.Get() == syncable::AUTOFILL) {
       expected_preferred_types.Put(syncable::AUTOFILL_PROFILE);
     }
@@ -170,12 +170,12 @@ TEST_F(SyncPrefsTest, ObservedPrefs) {
 TEST_F(SyncPrefsTest, AcknowledgeSyncedTypes) {
   SyncPrefs sync_prefs(&pref_service_);
 
-  syncable::ModelEnumSet expected_acknowledge_synced_types =
+  syncable::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::ModelEnumSet acknowledge_synced_types(type);
+    syncable::ModelTypeSet acknowledge_synced_types(type);
     expected_acknowledge_synced_types.Put(type);
     sync_prefs.AcknowledgeSyncedTypes(acknowledge_synced_types);
     EXPECT_TRUE(expected_acknowledge_synced_types.Equals(
@@ -220,7 +220,7 @@ TEST_F(SyncPrefsTest, NullPrefService) {
   EXPECT_FALSE(sync_prefs.IsStartSuppressed());
   EXPECT_EQ(base::Time(), sync_prefs.GetLastSyncedTime());
   EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced());
-  const syncable::ModelEnumSet non_passive_types = GetNonPassiveTypes();
+  const syncable::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());