[Sync] Replace all instances of ModelTypeBitSet with ModelEnumSet

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index f0074ff10257f8b74aacbd4b863b328bde4e0d84..d77fc6352e0cb6d1be5a1e364ef21f7d0784f275 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -354,12 +354,14 @@ bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
   GetPreferredDataTypes(&preferred_types);
   syncable::ModelTypeSet encrypted_types;
   GetEncryptedDataTypes(&encrypted_types);
-  syncable::ModelTypeBitSet preferred_types_bitset =
-      syncable::ModelTypeBitSetFromSet(preferred_types);
-  syncable::ModelTypeBitSet encrypted_types_bitset =
-      syncable::ModelTypeBitSetFromSet(encrypted_types);
+  const syncable::ModelEnumSet preferred_types_enum_set =
+      syncable::ModelTypeSetToEnumSet(preferred_types);
+  const syncable::ModelEnumSet encrypted_types_enum_set =
+      syncable::ModelTypeSetToEnumSet(encrypted_types);
   DCHECK(encrypted_types.count(syncable::PASSWORDS));
-  return (preferred_types_bitset & encrypted_types_bitset).any();
+  return
+      !Intersection(preferred_types_enum_set,
+                    encrypted_types_enum_set).Empty();
 }
 
 void ProfileSyncService::OnSyncConfigureDone(