[Sync] Rename ModelEnumSet to ModelTypeSet

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,
-                                    syncable::ModelEnumSet chosen_types) {
+                                    syncable::ModelTypeSet 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 67 matching lines @@
   }
 
   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::ModelEnumSet chosen_data_types_;
+  syncable::ModelTypeSet 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 431 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());
 }