[Sync] Replace all instances of ModelTypeBitSet with ModelEnumSet

chrome/browser/sync/sync_prefs.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 450 matching lines @@
   pref_service_->RegisterBooleanPref(prefs::kSyncManaged,
                                      false,
                                      PrefService::UNSYNCABLE_PREF);
   pref_service_->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
                                     "",
                                     PrefService::UNSYNCABLE_PREF);
 
   // We will start prompting people about new data types after the launch of
   // SESSIONS - all previously launched data types are treated as if they are
   // already acknowledged.
-  syncable::ModelTypeBitSet model_set;
-  model_set.set(syncable::BOOKMARKS);
-  model_set.set(syncable::PREFERENCES);
-  model_set.set(syncable::PASSWORDS);
-  model_set.set(syncable::AUTOFILL_PROFILE);
-  model_set.set(syncable::AUTOFILL);
-  model_set.set(syncable::THEMES);
-  model_set.set(syncable::EXTENSIONS);
-  model_set.set(syncable::NIGORI);
-  model_set.set(syncable::SEARCH_ENGINES);
-  model_set.set(syncable::APPS);
-  model_set.set(syncable::TYPED_URLS);
-  model_set.set(syncable::SESSIONS);
+  syncable::ModelEnumSet model_set;
+  model_set.Put(syncable::BOOKMARKS);
+  model_set.Put(syncable::PREFERENCES);
+  model_set.Put(syncable::PASSWORDS);
+  model_set.Put(syncable::AUTOFILL_PROFILE);
+  model_set.Put(syncable::AUTOFILL);
+  model_set.Put(syncable::THEMES);
+  model_set.Put(syncable::EXTENSIONS);
+  model_set.Put(syncable::NIGORI);
+  model_set.Put(syncable::SEARCH_ENGINES);
+  model_set.Put(syncable::APPS);
+  model_set.Put(syncable::TYPED_URLS);
+  model_set.Put(syncable::SESSIONS);
   pref_service_->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes,
-                                  syncable::ModelTypeBitSetToValue(model_set),
+                                  syncable::ModelEnumSetToValue(model_set),
                                   PrefService::UNSYNCABLE_PREF);
 
   pref_service_->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,
                                         PrefService::UNSYNCABLE_PREF);
 }
 
 void SyncPrefs::RegisterDataTypePreferredPref(syncable::ModelType type,
                                               bool is_preferred) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(pref_service_);
@@ skipping 27 matching lines @@
   const char* pref_name = GetPrefNameForDataType(type);
   if (!pref_name) {
     NOTREACHED();
     return;
   }
   pref_service_->SetBoolean(pref_name, is_preferred);
   pref_service_->ScheduleSavePersistentPrefs();
 }
 
 }  // namespace browser_sync