[Sync] Replace all instances of ModelTypeBitSet with ModelEnumSet

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <map>
 #include <set>
@@ skipping 336 matching lines @@
                           profile_, sync_prefs_.AsWeakPtr()));
 }
 
 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
   if (encryption_pending())
     return true;
   syncable::ModelTypeSet preferred_types;
   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(
     DataTypeManager::ConfigureResult result) {
   if (failed_datatypes_handler_.UpdateFailedDatatypes(result)) {
     ReconfigureDatatypeManager();
   }
 }
 
 void ProfileSyncService::StartUp() {
@@ skipping 1234 matching lines @@
              << "Unrecoverable error.";
   } else {
     DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
              << "initialized";
   }
 }
 
 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
   return failed_datatypes_handler_;
 }