[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/util/cryptographer.h

Index: chrome/browser/sync/util/cryptographer.h
diff --git a/chrome/browser/sync/util/cryptographer.h b/chrome/browser/sync/util/cryptographer.h
index b37029655c1fdbf6a4d9e6dcc96ec23f59ccd80f..2c66bbea9d9344a91be6ed5a6bdc798cb1c39cd9 100644
--- a/chrome/browser/sync/util/cryptographer.h
+++ b/chrome/browser/sync/util/cryptographer.h
@@ -62,7 +62,7 @@ class Cryptographer {
     // set of encrypted types is SensitiveTypes() and that the encrypt
     // everything flag is false.
     virtual void OnEncryptedTypesChanged(
-        syncable::ModelEnumSet encrypted_types,
+        syncable::ModelTypeSet encrypted_types,
         bool encrypt_everything) = 0;
 
    protected:
@@ -163,7 +163,7 @@ class Cryptographer {
   UpdateResult Update(const sync_pb::NigoriSpecifics& nigori);
 
   // The set of types that are always encrypted.
-  static syncable::ModelEnumSet SensitiveTypes();
+  static syncable::ModelTypeSet SensitiveTypes();
 
   // Reset our set of encrypted types based on the contents of the nigori
   // specifics.
@@ -180,11 +180,11 @@ class Cryptographer {
   bool encrypt_everything() const;
 
   // Return the set of encrypted types.
-  syncable::ModelEnumSet GetEncryptedTypes() const;
+  syncable::ModelTypeSet GetEncryptedTypes() const;
 
   // Forwards to MergeEncryptedTypes.
   void MergeEncryptedTypesForTest(
-      syncable::ModelEnumSet encrypted_types);
+      syncable::ModelTypeSet encrypted_types);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(CryptographerTest, PackUnpack);
@@ -192,7 +192,7 @@ class Cryptographer {
 
   // Merges the given set of encrypted types with the existing set and emits a
   // notification if necessary.
-  void MergeEncryptedTypes(syncable::ModelEnumSet encrypted_types);
+  void MergeEncryptedTypes(syncable::ModelTypeSet encrypted_types);
 
   void EmitEncryptedTypesChangedNotification();
 
@@ -216,7 +216,7 @@ class Cryptographer {
 
   scoped_ptr<sync_pb::EncryptedData> pending_keys_;
 
-  syncable::ModelEnumSet encrypted_types_;
+  syncable::ModelTypeSet encrypted_types_;
   bool encrypt_everything_;
 
   DISALLOW_COPY_AND_ASSIGN(Cryptographer);