[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/test/integration/migration_errors_test.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.
 
 // TODO(akalin): Rename this file to migration_test.cc.
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
@@ skipping 56 matching lines @@
 class MigrationTest : public SyncTest {
  public:
   explicit MigrationTest(TestType test_type) : SyncTest(test_type) {}
   virtual ~MigrationTest() {}
 
   // TODO(akalin): Add more MODIFY_(data type) trigger methods, as
   // well as a poll-based trigger method.
   enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_NOTIFICATION };
 
   syncable::ModelEnumSet GetPreferredDataTypes() {
-    syncable::ModelTypeSet preferred_data_types;
-    GetClient(0)->service()->GetPreferredDataTypes(&preferred_data_types);
+    const syncable::ModelEnumSet preferred_data_types =
+        GetClient(0)->service()->GetPreferredDataTypes();
     // Make sure all clients have the same preferred data types.
     for (int i = 1; i < num_clients(); ++i) {
-      syncable::ModelTypeSet other_preferred_data_types;
-      GetClient(i)->service()->GetPreferredDataTypes(
-          &other_preferred_data_types);
-      EXPECT_EQ(preferred_data_types, other_preferred_data_types);
+      const syncable::ModelEnumSet other_preferred_data_types =
+          GetClient(i)->service()->GetPreferredDataTypes();
+      EXPECT_TRUE(preferred_data_types.Equals(other_preferred_data_types));
     }
-    return syncable::ModelTypeSetToEnumSet(preferred_data_types);
+    return preferred_data_types;
   }
 
   // Returns a MigrationList with every enabled data type in its own
   // set.
   MigrationList GetPreferredDataTypesList() {
     MigrationList migration_list;
     const syncable::ModelEnumSet preferred_data_types =
         GetPreferredDataTypes();
     for (syncable::ModelEnumSet::Iterator it =
              preferred_data_types.First(); it.Good(); it.Inc()) {
@@ skipping 22 matching lines @@
         TriggerNotification(model_types);
         break;
       default:
         ADD_FAILURE();
     }
   }
 
   // Block until all clients have completed migration for the given
   // types.
   void AwaitMigration(syncable::ModelEnumSet migrate_types) {
-    const syncable::ModelTypeSet& migrate_types_set =
-        syncable::ModelEnumSetToSet(migrate_types);
     for (int i = 0; i < num_clients(); ++i) {
-      ASSERT_TRUE(GetClient(i)->AwaitMigration(migrate_types_set));
+      ASSERT_TRUE(GetClient(i)->AwaitMigration(migrate_types));
     }
   }
 
   bool ShouldRunMigrationTest() const {
     if (!ServerSupportsNotificationControl() ||
         !ServerSupportsErrorTriggering()) {
       LOG(WARNING) << "Test skipped in this server environment.";
       return false;
     }
     return true;
@@ skipping 301 matching lines @@
 
   // Phase 5: Verify that preferences can still be synchronized.
   VerifyPrefSync();
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 }  // namespace