2 files changed, 29 insertions, 32 deletions

diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index fd4363d..7acbfb6 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -43,25 +43,25 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   DisableNotifications();
 
   // Setup sync with no enabled types.
-  ASSERT_TRUE(GetClient(0)->SetupSync(syncable::ModelTypeSet()));
+  ASSERT_TRUE(GetClient(0)->SetupSync(syncable::ModelEnumSet()));
 
-  syncable::ModelTypeSet registered_types;
-  GetClient(0)->service()->GetRegisteredDataTypes(&registered_types);
+  const syncable::ModelEnumSet registered_types =
+      GetClient(0)->service()->GetRegisteredDataTypes();
   sync_api::UserShare* user_share = GetClient(0)->service()->GetUserShare();
-  for (syncable::ModelTypeSet::const_iterator it = registered_types.begin();
-       it != registered_types.end(); ++it) {
-    ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(*it));
+  for (syncable::ModelEnumSet::Iterator it = registered_types.First();
+       it.Good(); it.Inc()) {
+    ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (*it == syncable::AUTOFILL_PROFILE) {
+    if (it.Get() == syncable::AUTOFILL_PROFILE) {
       continue;
     }
 
-    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, *it))
-        << syncable::ModelTypeToString(*it);
+    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()))
+        << syncable::ModelTypeToString(it.Get());
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (*it == syncable::AUTOFILL) {
+    if (it.Get() == syncable::AUTOFILL) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
                                         syncable::AUTOFILL_PROFILE));
     }
@@ -78,34 +78,34 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   // Setup sync with no disabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync());
 
-  syncable::ModelTypeSet registered_types;
-  GetClient(0)->service()->GetRegisteredDataTypes(&registered_types);
+  const syncable::ModelEnumSet registered_types =
+      GetClient(0)->service()->GetRegisteredDataTypes();
 
   sync_api::UserShare* user_share = GetClient(0)->service()->GetUserShare();
 
   // Make sure all top-level nodes exist first.
-  for (syncable::ModelTypeSet::const_iterator it = registered_types.begin();
-       it != registered_types.end(); ++it) {
-    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, *it));
+  for (syncable::ModelEnumSet::Iterator it = registered_types.First();
+       it.Good(); it.Inc()) {
+    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
   }
 
-  for (syncable::ModelTypeSet::const_iterator it = registered_types.begin();
-       it != registered_types.end(); ++it) {
-    ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(*it));
+  for (syncable::ModelEnumSet::Iterator it = registered_types.First();
+       it.Good(); it.Inc()) {
+    ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (*it == syncable::AUTOFILL_PROFILE) {
+    if (it.Get() == syncable::AUTOFILL_PROFILE) {
       continue;
     }
 
     sync_api::UserShare* user_share =
         GetClient(0)->service()->GetUserShare();
 
-    ASSERT_FALSE(DoesTopLevelNodeExist(user_share, *it))
-        << syncable::ModelTypeToString(*it);
+    ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get()))
+        << syncable::ModelTypeToString(it.Get());
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (*it == syncable::AUTOFILL) {
+    if (it.Get() == syncable::AUTOFILL) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncable::AUTOFILL_PROFILE));
     }
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index 32a5944..1034da2 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -74,16 +74,15 @@ class MigrationTest : public SyncTest {
   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
@@ -126,10 +125,8 @@ class MigrationTest : public SyncTest {
   // 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));
     }
   }