[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/profile_sync_service_startup_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 109 matching lines @@
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   // Create some tokens in the token service; the service will startup when
   // it is notified that tokens are available.
   service_->OnUserSubmittedAuth("test_user", "", "", "");
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
 
-  syncable::ModelTypeSet set;
-  set.insert(syncable::BOOKMARKS);
-  service_->OnUserChoseDatatypes(false, set);
+  service_->OnUserChoseDatatypes(
+      false, syncable::ModelEnumSet(syncable::BOOKMARKS));
   EXPECT_TRUE(service_->ShouldPushChanges());
 }
 
 TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   EXPECT_CALL(*data_type_manager, state()).
       WillRepeatedly(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
@@ skipping 128 matching lines @@
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED;
   SyncError error(FROM_HERE, "Association failed.", syncable::BOOKMARKS);
   std::list<SyncError> errors;
   errors.push_back(error);
   browser_sync::DataTypeManager::ConfigureResult result(
       status,
-      syncable::ModelTypeSet(),
+      syncable::ModelEnumSet(),
       errors);
   EXPECT_CALL(*data_type_manager, Configure(_, _)).
       WillRepeatedly(
           DoAll(
               NotifyFromDataTypeManager(data_type_manager,
                   static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_START)),
               NotifyFromDataTypeManagerWithResult(data_type_manager,
                   static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
                   &result)));
   EXPECT_CALL(*data_type_manager, state()).
@@ skipping 15 matching lines @@
 
   // Preload the tokens.
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   service_->fail_initial_download();
 
   service_->Initialize();
   EXPECT_FALSE(service_->sync_initialized());
   EXPECT_FALSE(service_->GetBackendForTest());
 }