[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/internal_api/write_node.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 "chrome/browser/sync/internal_api/write_node.h"
 
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/sync/engine/nigori_util.h"
@@ skipping 20 matching lines @@
 namespace sync_api {
 
 static const char kDefaultNameForNewNodes[] = " ";
 
 bool WriteNode::UpdateEntryWithEncryption(
     browser_sync::Cryptographer* cryptographer,
     const sync_pb::EntitySpecifics& new_specifics,
     syncable::MutableEntry* entry) {
   syncable::ModelType type = syncable::GetModelTypeFromSpecifics(new_specifics);
   DCHECK_GE(type, syncable::FIRST_REAL_MODEL_TYPE);
-  syncable::ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes();
+  syncable::ModelEnumSet encrypted_types = cryptographer->GetEncryptedTypes();
   sync_pb::EntitySpecifics generated_specifics;
   if (!SpecificsNeedsEncryption(encrypted_types, new_specifics) ||
       !cryptographer->is_initialized()) {
     // No encryption required or we are unable to encrypt.
     generated_specifics.CopyFrom(new_specifics);
   } else {
     // Encrypt new_specifics into generated_specifics.
     if (VLOG_IS_ON(2)) {
       scoped_ptr<DictionaryValue> value(entry->ToValue());
       std::string info;
@@ skipping 60 matching lines @@
   std::string server_legal_name;
   SyncAPINameToServerName(WideToUTF8(title), &server_legal_name);
 
   string old_name = entry_->Get(syncable::NON_UNIQUE_NAME);
 
   if (server_legal_name == old_name)
     return;  // Skip redundant changes.
 
   // Only set NON_UNIQUE_NAME to the title if we're not encrypted.
   Cryptographer* cryptographer = GetTransaction()->GetCryptographer();
-  if (cryptographer->GetEncryptedTypes().count(GetModelType()) > 0) {
+  if (cryptographer->GetEncryptedTypes().Has(GetModelType())) {
     if (old_name != kEncryptedString)
       entry_->Put(syncable::NON_UNIQUE_NAME, kEncryptedString);
   } else {
     entry_->Put(syncable::NON_UNIQUE_NAME, server_legal_name);
   }
 
   // For bookmarks, we also set the title field in the specifics.
   // TODO(zea): refactor bookmarks to not need this functionality.
   if (GetModelType() == syncable::BOOKMARKS) {
     specifics.MutableExtension(sync_pb::bookmark)->set_title(server_legal_name);
@@ skipping 385 matching lines @@
   sync_pb::BookmarkSpecifics new_value = GetBookmarkSpecifics();
   new_value.set_favicon(bytes.empty() ? NULL : &bytes[0], bytes.size());
   SetBookmarkSpecifics(new_value);
 }
 
 void WriteNode::MarkForSyncing() {
   syncable::MarkForSyncing(entry_);
 }
 
 } // namespace sync_api