[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/sync_setup_wizard_unittest.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_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 63 matching lines @@
   virtual void OnUserSubmittedAuth(const std::string& username,
                                    const std::string& password,
                                    const std::string& captcha,
                                    const std::string& access_code) {
     username_ = username;
     password_ = password;
     captcha_ = captcha;
   }
 
   virtual void OnUserChoseDatatypes(bool sync_everything,
-      const syncable::ModelTypeSet& chosen_types) {
+                                    syncable::ModelEnumSet chosen_types) {
     user_chose_data_types_ = true;
     chosen_data_types_ = chosen_types;
   }
 
   virtual void OnUserCancelledDialog() {
     user_cancelled_dialog_ = true;
   }
 
   virtual void SetPassphrase(const std::string& passphrase,
                              bool is_explicit) {
@@ skipping 39 matching lines @@
     encrypt_everything_ = encrypt_everything;
   }
 
   void ResetTestStats() {
     username_.clear();
     password_.clear();
     captcha_.clear();
     user_cancelled_dialog_ = false;
     user_chose_data_types_ = false;
     keep_everything_synced_ = false;
-    chosen_data_types_.clear();
+    chosen_data_types_.Clear();
   }
 
   // Use this to have the service act as if it were running under CrOS.
   void set_cros_mode() {
     cros_user_ = kTestUser;
   }
 
   virtual void ShowSyncSetup(const std::string& sub_page) {
     // Do Nothing.
   }
 
   void ClearObservers() {
     observers_.Clear();
   }
 
   SyncSetupWizard* GetWizard() {
     return &wizard_;
   }
 
   std::string username_;
   std::string password_;
   std::string captcha_;
   bool user_cancelled_dialog_;
   bool user_chose_data_types_;
   bool keep_everything_synced_;
   bool is_using_secondary_passphrase_;
   bool encrypt_everything_;
-  syncable::ModelTypeSet chosen_data_types_;
+  syncable::ModelEnumSet chosen_data_types_;
   std::string passphrase_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceForWizardTest);
 };
 
 class TestingProfileWithSyncService : public TestingProfile {
  public:
   TestingProfileWithSyncService() {
     sync_service_.reset(new ProfileSyncServiceForWizardTest(&factory_, this));
@@ skipping 152 matching lines @@
       "\"encryptAllData\":false}";
   data_type_choices_value.Append(new StringValue(data_type_choices));
 
   // Simulate the user choosing data types; bookmarks, prefs, typed URLS, and
   // apps are on, the rest are off.
   handler_.HandleConfigure(&data_type_choices_value);
   // Since we don't need a passphrase, wizard should have transitioned to
   // DONE state and closed the UI.
   EXPECT_FALSE(wizard_->IsVisible());
   EXPECT_FALSE(service_->keep_everything_synced_);
-  EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::BOOKMARKS));
-  EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::PREFERENCES));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::THEMES));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::PASSWORDS));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::AUTOFILL));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::EXTENSIONS));
-  EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::TYPED_URLS));
-  EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::APPS));
-  EXPECT_EQ(0U, service_->chosen_data_types_.count(
+  EXPECT_TRUE(service_->chosen_data_types_.Has(syncable::BOOKMARKS));
+  EXPECT_TRUE(service_->chosen_data_types_.Has(syncable::PREFERENCES));
+  EXPECT_FALSE(service_->chosen_data_types_.Has(syncable::THEMES));
+  EXPECT_FALSE(service_->chosen_data_types_.Has(syncable::PASSWORDS));
+  EXPECT_FALSE(service_->chosen_data_types_.Has(syncable::AUTOFILL));
+  EXPECT_FALSE(service_->chosen_data_types_.Has(syncable::EXTENSIONS));
+  EXPECT_TRUE(service_->chosen_data_types_.Has(syncable::TYPED_URLS));
+  EXPECT_TRUE(service_->chosen_data_types_.Has(syncable::APPS));
+  EXPECT_FALSE(service_->chosen_data_types_.Has(
       syncable::APP_NOTIFICATIONS));
 }
 
 TEST_F(SyncSetupWizardTest, ShowErrorUIForPasswordTest) {
   service_->ClearObservers();
   CompleteSetup();
 
   // Simulate an auth error and make sure the start and end state are set
   // right.
   service_->set_last_auth_error(
@@ skipping 250 matching lines @@
 
   service_->set_last_auth_error(
       AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
   wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   CloseSetupUI();
   EXPECT_FALSE(wizard_->IsVisible());
 }