[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/engine/nigori_util.cc

Index: chrome/browser/sync/engine/nigori_util.cc
diff --git a/chrome/browser/sync/engine/nigori_util.cc b/chrome/browser/sync/engine/nigori_util.cc
index 3e0c27ce1810b1f27c784fd42c007354ebd9374f..df9bd4dd4e69cb3f09bb6680069de53e2631d3b1 100644
--- a/chrome/browser/sync/engine/nigori_util.cc
+++ b/chrome/browser/sync/engine/nigori_util.cc
@@ -19,8 +19,6 @@ bool ProcessUnsyncedChangesForEncryption(
     WriteTransaction* const trans,
     browser_sync::Cryptographer* cryptographer) {
   DCHECK(cryptographer->is_ready());
-  syncable::ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes();
-
   // Get list of all datatypes with unsynced changes. It's possible that our
   // local changes need to be encrypted if encryption for that datatype was
   // just turned on (and vice versa). This should never affect passwords.
@@ -40,7 +38,7 @@ bool ProcessUnsyncedChangesForEncryption(
 
 bool VerifyUnsyncedChangesAreEncrypted(
     BaseTransaction* const trans,
-    const ModelTypeSet& encrypted_types) {
+    ModelEnumSet encrypted_types) {
   std::vector<int64> handles;
   browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
   for (size_t i = 0; i < handles.size(); ++i) {
@@ -55,7 +53,7 @@ bool VerifyUnsyncedChangesAreEncrypted(
   return true;
 }
 
-bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
+bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
                           const Entry& entry) {
   if (!entry.Get(UNIQUE_SERVER_TAG).empty())
     return false;  // We don't encrypt unique server nodes.
@@ -66,16 +64,18 @@ bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
   // the data, nor for determining if data is encrypted. We simply ensure it has
   // been overwritten to avoid any possible leaks of sensitive data.
   return SpecificsNeedsEncryption(encrypted_types, entry.Get(SPECIFICS)) ||
-         (encrypted_types.count(type) > 0 &&
+         (encrypted_types.Has(type) &&
           entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
 }
 
-bool SpecificsNeedsEncryption(const ModelTypeSet& encrypted_types,
+bool SpecificsNeedsEncryption(ModelEnumSet encrypted_types,
                               const sync_pb::EntitySpecifics& specifics) {
-  ModelType type = GetModelTypeFromSpecifics(specifics);
+  const ModelType type = GetModelTypeFromSpecifics(specifics);
+  if (!syncable::IsRealDataType(type))
+    return false;
   if (type == PASSWORDS || type == NIGORI)
     return false;  // These types have their own encryption schemes.
-  if (encrypted_types.count(type) == 0)
+  if (!encrypted_types.Has(type))
     return false;  // This type does not require encryption
   return !specifics.has_encrypted();
 }