[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/engine/nigori_util.h

Index: chrome/browser/sync/engine/nigori_util.h
diff --git a/chrome/browser/sync/engine/nigori_util.h b/chrome/browser/sync/engine/nigori_util.h
index 08ed0d4925d5b43026212232947adb6af4899ee4..33ba53dd16f6bef94a198e84baa11f782aa8bc51 100644
--- a/chrome/browser/sync/engine/nigori_util.h
+++ b/chrome/browser/sync/engine/nigori_util.h
@@ -36,7 +36,7 @@ class WriteTransaction;
 // modify the data and does not care if data is unnecessarily encrypted.
 bool VerifyUnsyncedChangesAreEncrypted(
     BaseTransaction* const trans,
-    ModelEnumSet encrypted_types);
+    ModelTypeSet encrypted_types);
 
 // Processes all unsynced changes and ensures they are appropriately encrypted
 // or unencrypted, based on |encrypted_types|.
@@ -47,11 +47,11 @@ bool ProcessUnsyncedChangesForEncryption(
 // Returns true if the entry requires encryption but is not encrypted, false
 // otherwise. Note: this does not check that already encrypted entries are
 // encrypted with the proper key.
-bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
+bool EntryNeedsEncryption(ModelTypeSet encrypted_types,
                           const Entry& entry);
 
 // Same as EntryNeedsEncryption, but looks at specifics.
-bool SpecificsNeedsEncryption(ModelEnumSet encrypted_types,
+bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
                               const sync_pb::EntitySpecifics& specifics);
 
 // Verifies all data of type |type| is encrypted appropriately.