[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/sync_setup_flow.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_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Helper function to disable password sync.
 void DisablePasswordSync(ProfileSyncService* service) {
-  syncable::ModelTypeSet types;
-  service->GetPreferredDataTypes(&types);
-  types.erase(syncable::PASSWORDS);
+  syncable::ModelEnumSet types = service->GetPreferredDataTypes();
+  types.Remove(syncable::PASSWORDS);
   service->OnUserChoseDatatypes(false, types);
 }
 
 // Returns the next step for the non-fatal error case.
 SyncSetupWizard::State GetStepForNonFatalError(ProfileSyncService* service) {
   // TODO(sync): Update this error handling to allow different platforms to
   // display the error appropriately (http://crbug.com/92722) instead of
   // navigating to a LOGIN state that is not supported on every platform.
   if (service->IsPassphraseRequired()) {
     if (service->IsUsingSecondaryPassphrase())
@@ skipping 72 matching lines @@
                                         DictionaryValue* args) {
   // The SYNC_EVERYTHING case will set this to true.
   args->SetBoolean("showSyncEverythingPage", false);
 
   args->SetBoolean("syncAllDataTypes",
       service->profile()->GetPrefs()->GetBoolean(
           prefs::kSyncKeepEverythingSynced));
 
   // Bookmarks, Preferences, and Themes are launched for good, there's no
   // going back now.  Check if the other data types are registered though.
-  syncable::ModelTypeSet registered_types;
-  service->GetRegisteredDataTypes(&registered_types);
-  syncable::ModelTypeSet preferred_types;
-  service->GetPreferredDataTypes(&preferred_types);
+  const syncable::ModelEnumSet registered_types =
+      service->GetRegisteredDataTypes();
+  const syncable::ModelEnumSet preferred_types =
+      service->GetPreferredDataTypes();
   args->SetBoolean("passwordsRegistered",
-      registered_types.count(syncable::PASSWORDS) > 0);
+      registered_types.Has(syncable::PASSWORDS));
   args->SetBoolean("autofillRegistered",
-      registered_types.count(syncable::AUTOFILL) > 0);
+      registered_types.Has(syncable::AUTOFILL));
   args->SetBoolean("extensionsRegistered",
-      registered_types.count(syncable::EXTENSIONS) > 0);
+      registered_types.Has(syncable::EXTENSIONS));
   args->SetBoolean("typedUrlsRegistered",
-      registered_types.count(syncable::TYPED_URLS) > 0);
+      registered_types.Has(syncable::TYPED_URLS));
   args->SetBoolean("appsRegistered",
-      registered_types.count(syncable::APPS) > 0);
+      registered_types.Has(syncable::APPS));
   args->SetBoolean("sessionsRegistered",
-      registered_types.count(syncable::SESSIONS) > 0);
+      registered_types.Has(syncable::SESSIONS));
   args->SetBoolean("syncBookmarks",
-                   preferred_types.count(syncable::BOOKMARKS) > 0);
+                   preferred_types.Has(syncable::BOOKMARKS));
   args->SetBoolean("syncPreferences",
-                   preferred_types.count(syncable::PREFERENCES) > 0);
+                   preferred_types.Has(syncable::PREFERENCES));
   args->SetBoolean("syncThemes",
-                   preferred_types.count(syncable::THEMES) > 0);
+                   preferred_types.Has(syncable::THEMES));
   args->SetBoolean("syncPasswords",
-                   preferred_types.count(syncable::PASSWORDS) > 0);
+                   preferred_types.Has(syncable::PASSWORDS));
   args->SetBoolean("syncAutofill",
-                   preferred_types.count(syncable::AUTOFILL) > 0);
+                   preferred_types.Has(syncable::AUTOFILL));
   args->SetBoolean("syncExtensions",
-                   preferred_types.count(syncable::EXTENSIONS) > 0);
+                   preferred_types.Has(syncable::EXTENSIONS));
   args->SetBoolean("syncSessions",
-                   preferred_types.count(syncable::SESSIONS) > 0);
+                   preferred_types.Has(syncable::SESSIONS));
   args->SetBoolean("syncTypedUrls",
-                   preferred_types.count(syncable::TYPED_URLS) > 0);
+                   preferred_types.Has(syncable::TYPED_URLS));
   args->SetBoolean("syncApps",
-                   preferred_types.count(syncable::APPS) > 0);
+                   preferred_types.Has(syncable::APPS));
 
   args->SetBoolean("encryptionEnabled",
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableSyncEncryption));
 
   bool encrypt_all = service->EncryptEverythingEnabled();
   if (service->encryption_pending())
     encrypt_all = true;
   args->SetBoolean("encryptAllData", encrypt_all);
 
@@ skipping 324 matching lines @@
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(UTF8ToUTF16(
           service_->profile()->GetPrefs()->GetString(
           prefs::kGoogleServicesUsername)));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }