[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 71 matching lines @@
   DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
   if (!result->GetBoolean("syncAllDataTypes", &config->sync_everything))
     return false;
 
   // These values need to be kept in sync with where they are written in
   // choose_datatypes.html.
   bool sync_bookmarks;
   if (!result->GetBoolean("syncBookmarks", &sync_bookmarks))
     return false;
   if (sync_bookmarks)
-    config->data_types.insert(syncable::BOOKMARKS);
+    config->data_types.Put(syncable::BOOKMARKS);
 
   bool sync_preferences;
   if (!result->GetBoolean("syncPreferences", &sync_preferences))
     return false;
   if (sync_preferences)
-    config->data_types.insert(syncable::PREFERENCES);
+    config->data_types.Put(syncable::PREFERENCES);
 
   bool sync_themes;
   if (!result->GetBoolean("syncThemes", &sync_themes))
     return false;
   if (sync_themes)
-    config->data_types.insert(syncable::THEMES);
+    config->data_types.Put(syncable::THEMES);
 
   bool sync_passwords;
   if (!result->GetBoolean("syncPasswords", &sync_passwords))
     return false;
   if (sync_passwords)
-    config->data_types.insert(syncable::PASSWORDS);
+    config->data_types.Put(syncable::PASSWORDS);
 
   bool sync_autofill;
   if (!result->GetBoolean("syncAutofill", &sync_autofill))
     return false;
   if (sync_autofill)
-    config->data_types.insert(syncable::AUTOFILL);
+    config->data_types.Put(syncable::AUTOFILL);
 
   bool sync_extensions;
   if (!result->GetBoolean("syncExtensions", &sync_extensions))
     return false;
   if (sync_extensions) {
-    config->data_types.insert(syncable::EXTENSIONS);
-    config->data_types.insert(syncable::EXTENSION_SETTINGS);
+    config->data_types.Put(syncable::EXTENSIONS);
+    config->data_types.Put(syncable::EXTENSION_SETTINGS);
   }
 
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
-    config->data_types.insert(syncable::TYPED_URLS);
+    config->data_types.Put(syncable::TYPED_URLS);
 
   bool sync_sessions;
   if (!result->GetBoolean("syncSessions", &sync_sessions))
     return false;
   if (sync_sessions)
-    config->data_types.insert(syncable::SESSIONS);
+    config->data_types.Put(syncable::SESSIONS);
 
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
   if (sync_apps) {
-    config->data_types.insert(syncable::APPS);
-    config->data_types.insert(syncable::APP_SETTINGS);
+    config->data_types.Put(syncable::APPS);
+    config->data_types.Put(syncable::APP_SETTINGS);
   }
 
   // Encryption settings.
   if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
     return false;
 
   // Passphrase settings.
   bool have_passphrase;
   if (!result->GetBoolean("usePassphrase", &have_passphrase))
     return false;
@@ skipping 41 matching lines @@
 
   PrefService* pref_service = profile->GetPrefs();
   CHECK(pref_service);
 
   if (config.sync_everything !=
       pref_service->GetBoolean(prefs::kSyncKeepEverythingSynced))
     return true;
 
   // Only check the data types that are explicitly listed on the sync
   // preferences page.
-  const syncable::ModelTypeSet& types = config.data_types;
-  if (((types.find(syncable::BOOKMARKS) != types.end()) !=
+  const syncable::ModelEnumSet types = config.data_types;
+  if (((types.Has(syncable::BOOKMARKS)) !=
        pref_service->GetBoolean(prefs::kSyncBookmarks)) ||
-      ((types.find(syncable::PREFERENCES) != types.end()) !=
+      ((types.Has(syncable::PREFERENCES)) !=
        pref_service->GetBoolean(prefs::kSyncPreferences)) ||
-      ((types.find(syncable::THEMES) != types.end()) !=
+      ((types.Has(syncable::THEMES)) !=
        pref_service->GetBoolean(prefs::kSyncThemes)) ||
-      ((types.find(syncable::PASSWORDS) != types.end()) !=
+      ((types.Has(syncable::PASSWORDS)) !=
        pref_service->GetBoolean(prefs::kSyncPasswords)) ||
-      ((types.find(syncable::AUTOFILL) != types.end()) !=
+      ((types.Has(syncable::AUTOFILL)) !=
        pref_service->GetBoolean(prefs::kSyncAutofill)) ||
-      ((types.find(syncable::EXTENSIONS) != types.end()) !=
+      ((types.Has(syncable::EXTENSIONS)) !=
        pref_service->GetBoolean(prefs::kSyncExtensions)) ||
-      ((types.find(syncable::TYPED_URLS) != types.end()) !=
+      ((types.Has(syncable::TYPED_URLS)) !=
        pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
-      ((types.find(syncable::SESSIONS) != types.end()) !=
+      ((types.Has(syncable::SESSIONS)) !=
        pref_service->GetBoolean(prefs::kSyncSessions)) ||
-      ((types.find(syncable::APPS) != types.end()) !=
+      ((types.Has(syncable::APPS)) !=
        pref_service->GetBoolean(prefs::kSyncApps)))
     return true;
 
   return false;
 }
 
 bool GetPassphrase(const std::string& json, std::string* passphrase) {
   scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
@@ skipping 340 matching lines @@
 
   // We do not do UMA logging during unit tests.
   if (web_ui_) {
     Profile* profile = Profile::FromWebUI(web_ui_);
     if (HasConfigurationChanged(configuration, profile)) {
       UMA_HISTOGRAM_BOOLEAN("Sync.SyncEverything",
                             configuration.sync_everything);
       if (!configuration.sync_everything) {
         // Only log the data types that are explicitly listed on the sync
         // preferences page.
-        const syncable::ModelTypeSet& types = configuration.data_types;
-        if (types.find(syncable::BOOKMARKS) != types.end())
+        const syncable::ModelEnumSet types = configuration.data_types;
+        if (types.Has(syncable::BOOKMARKS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", BOOKMARKS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::PREFERENCES) != types.end())
+        if (types.Has(syncable::PREFERENCES))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", PREFERENCES, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::PASSWORDS) != types.end())
+        if (types.Has(syncable::PASSWORDS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", PASSWORDS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::AUTOFILL) != types.end())
+        if (types.Has(syncable::AUTOFILL))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", AUTOFILL, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::THEMES) != types.end())
+        if (types.Has(syncable::THEMES))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", THEMES, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::TYPED_URLS) != types.end())
+        if (types.Has(syncable::TYPED_URLS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", TYPED_URLS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::EXTENSIONS) != types.end())
+        if (types.Has(syncable::EXTENSIONS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", EXTENSIONS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::SESSIONS) != types.end())
+        if (types.Has(syncable::SESSIONS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", SESSIONS, SELECTABLE_DATATYPE_COUNT + 1);
-        if (types.find(syncable::APPS) != types.end())
+        if (types.Has(syncable::APPS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", APPS, SELECTABLE_DATATYPE_COUNT + 1);
         COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
                        UpdateCustomConfigHistogram);
         COMPILE_ASSERT(9 == SELECTABLE_DATATYPE_COUNT,
                        UpdateCustomConfigHistogram);
       }
       UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
                             configuration.set_gaia_passphrase ||
@@ skipping 151 matching lines @@
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }