[Sync] Rename ModelEnumSet to ModelTypeSet

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 169 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::ModelEnumSet types = config.data_types;
+  const syncable::ModelTypeSet types = config.data_types;
   if (((types.Has(syncable::BOOKMARKS)) !=
        pref_service->GetBoolean(prefs::kSyncBookmarks)) ||
       ((types.Has(syncable::PREFERENCES)) !=
        pref_service->GetBoolean(prefs::kSyncPreferences)) ||
       ((types.Has(syncable::THEMES)) !=
        pref_service->GetBoolean(prefs::kSyncThemes)) ||
       ((types.Has(syncable::PASSWORDS)) !=
        pref_service->GetBoolean(prefs::kSyncPasswords)) ||
       ((types.Has(syncable::AUTOFILL)) !=
        pref_service->GetBoolean(prefs::kSyncAutofill)) ||
@@ skipping 364 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::ModelEnumSet types = configuration.data_types;
+        const syncable::ModelTypeSet types = configuration.data_types;
         if (types.Has(syncable::BOOKMARKS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", BOOKMARKS, SELECTABLE_DATATYPE_COUNT + 1);
         if (types.Has(syncable::PREFERENCES))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", PREFERENCES, SELECTABLE_DATATYPE_COUNT + 1);
         if (types.Has(syncable::PASSWORDS))
           UMA_HISTOGRAM_ENUMERATION(
               "Sync.CustomSync", PASSWORDS, SELECTABLE_DATATYPE_COUNT + 1);
         if (types.Has(syncable::AUTOFILL))
@@ skipping 176 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);
 }