[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/util/cryptographer.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 <algorithm>
 
 #include "base/base64.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 
@@ skipping 255 matching lines @@
       return Cryptographer::SUCCESS;
     } else {
       SetPendingKeys(nigori.encrypted());
       return Cryptographer::NEEDS_PASSPHRASE;
     }
   }
   return Cryptographer::SUCCESS;
 }
 
 // Static
-syncable::ModelEnumSet Cryptographer::SensitiveTypes() {
+syncable::ModelTypeSet Cryptographer::SensitiveTypes() {
   // Both of these have their own encryption schemes, but we include them
   // anyways.
-  syncable::ModelEnumSet types;
+  syncable::ModelTypeSet types;
   types.Put(syncable::PASSWORDS);
   types.Put(syncable::NIGORI);
   return types;
 }
 
 void Cryptographer::UpdateEncryptedTypesFromNigori(
     const sync_pb::NigoriSpecifics& nigori) {
   if (nigori.encrypt_everything()) {
     set_encrypt_everything();
     return;
   }
 
-  syncable::ModelEnumSet encrypted_types(SensitiveTypes());
+  syncable::ModelTypeSet encrypted_types(SensitiveTypes());
   if (nigori.encrypt_bookmarks())
     encrypted_types.Put(syncable::BOOKMARKS);
   if (nigori.encrypt_preferences())
     encrypted_types.Put(syncable::PREFERENCES);
   if (nigori.encrypt_autofill_profile())
     encrypted_types.Put(syncable::AUTOFILL_PROFILE);
   if (nigori.encrypt_autofill())
     encrypted_types.Put(syncable::AUTOFILL);
   if (nigori.encrypt_themes())
     encrypted_types.Put(syncable::THEMES);
@@ skipping 48 matching lines @@
   nigori->set_encrypt_sessions(encrypted_types_.Has(syncable::SESSIONS));
   nigori->set_encrypt_app_settings(
       encrypted_types_.Has(syncable::APP_SETTINGS));
   nigori->set_encrypt_apps(encrypted_types_.Has(syncable::APPS));
   nigori->set_encrypt_app_notifications(
       encrypted_types_.Has(syncable::APP_NOTIFICATIONS));
 }
 
 void Cryptographer::set_encrypt_everything() {
   if (encrypt_everything_) {
-    DCHECK(encrypted_types_.Equals(syncable::ModelEnumSet::All()));
+    DCHECK(encrypted_types_.Equals(syncable::ModelTypeSet::All()));
     return;
   }
   encrypt_everything_ = true;
   // Change |encrypted_types_| directly to avoid sending more than one
   // notification.
-  encrypted_types_ = syncable::ModelEnumSet::All();
+  encrypted_types_ = syncable::ModelTypeSet::All();
   EmitEncryptedTypesChangedNotification();
 }
 
 bool Cryptographer::encrypt_everything() const {
   return encrypt_everything_;
 }
 
-syncable::ModelEnumSet Cryptographer::GetEncryptedTypes() const {
+syncable::ModelTypeSet Cryptographer::GetEncryptedTypes() const {
   return encrypted_types_;
 }
 
 void Cryptographer::MergeEncryptedTypesForTest(
-    syncable::ModelEnumSet encrypted_types) {
+    syncable::ModelTypeSet encrypted_types) {
   MergeEncryptedTypes(encrypted_types);
 }
 
 void Cryptographer::MergeEncryptedTypes(
-    syncable::ModelEnumSet encrypted_types) {
+    syncable::ModelTypeSet encrypted_types) {
   if (encrypted_types_.HasAll(encrypted_types)) {
     return;
   }
   encrypted_types_ = encrypted_types;
   EmitEncryptedTypesChangedNotification();
 }
 
 void Cryptographer::EmitEncryptedTypesChangedNotification() {
   FOR_EACH_OBSERVER(
       Observer, observers_,
@@ skipping 15 matching lines @@
         continue;
       }
       nigoris_[key.name()] = make_linked_ptr(new_nigori.release());
     }
   }
   DCHECK(nigoris_.end() != nigoris_.find(default_key_name));
   default_nigori_ = &*nigoris_.find(default_key_name);
 }
 
 }  // namespace browser_sync