[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/util/cryptographer.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
 #define CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 44 matching lines @@
     // types.
     //
     // |encrypted_types| will always be a superset of
     // SensitiveTypes().  If |encrypt_everything| is true,
     // |encrypted_types| will be the set of all known types.
     //
     // Until this function is called, observers can assume that the
     // 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:
     virtual ~Observer();
   };
 
   Cryptographer();
   ~Cryptographer();
 
   // When update on cryptographer is called this enum tells if the
@@ skipping 80 matching lines @@
   // can't be created (i.e. if this Cryptograhper doesn't have valid keys).
   bool GetBootstrapToken(std::string* token) const;
 
   // Update the cryptographer based on the contents of the nigori specifics.
   // This updates both the encryption keys and the set of encrypted types.
   // Returns NEEDS_PASSPHRASE if was unable to decrypt the pending keys,
   // SUCCESS otherwise.
   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.
   void UpdateEncryptedTypesFromNigori(const sync_pb::NigoriSpecifics& nigori);
 
   // Update the nigori to reflect the current set of encrypted types.
   void UpdateNigoriFromEncryptedTypes(sync_pb::NigoriSpecifics* nigori) const;
 
   // Setter/getter for whether all current and future datatypes should
   // be encrypted. Once set you cannot unset without reading from a
   // new nigori node.  set_encrypt_everything() emits a notification
   // the first time it's called.
   void set_encrypt_everything();
   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);
   typedef std::map<std::string, linked_ptr<const Nigori> > NigoriMap;
 
   // 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();
 
   // Helper method to instantiate Nigori instances for each set of key
   // parameters in |bag| and setting the default encryption key to
   // |default_key_name|.
   void InstallKeys(const std::string& default_key_name,
                    const sync_pb::NigoriKeyBag& bag);
 
   bool AddKeyImpl(Nigori* nigori);
 
   // Functions to serialize + encrypt a Nigori object in an opaque format for
   // persistence by sync infrastructure.
   bool PackBootstrapToken(const Nigori* nigori, std::string* pack_into) const;
   Nigori* UnpackBootstrapToken(const std::string& token) const;
 
   ObserverList<Observer> observers_;
 
   NigoriMap nigoris_;  // The Nigoris we know about, mapped by key name.
   NigoriMap::value_type* default_nigori_;  // The Nigori used for encryption.
 
   scoped_ptr<sync_pb::EncryptedData> pending_keys_;
 
-  syncable::ModelEnumSet encrypted_types_;
+  syncable::ModelTypeSet encrypted_types_;
   bool encrypt_everything_;
 
   DISALLOW_COPY_AND_ASSIGN(Cryptographer);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_