Index: chrome/browser/sync/internal_api/write_node.cc |
diff --git a/chrome/browser/sync/internal_api/write_node.cc b/chrome/browser/sync/internal_api/write_node.cc |
index b088dc1a28d84fbecd2c51548eae62331b45c5d8..c693eaca98dbda770a763237d391a0d60411249b 100644 |
--- a/chrome/browser/sync/internal_api/write_node.cc |
+++ b/chrome/browser/sync/internal_api/write_node.cc |
@@ -38,7 +38,8 @@ bool WriteNode::UpdateEntryWithEncryption( |
syncable::MutableEntry* entry) { |
syncable::ModelType type = syncable::GetModelTypeFromSpecifics(new_specifics); |
DCHECK_GE(type, syncable::FIRST_REAL_MODEL_TYPE); |
- syncable::ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes(); |
+ const syncable::ModelEnumSet encrypted_types = |
+ cryptographer->GetEncryptedTypes(); |
sync_pb::EntitySpecifics generated_specifics; |
if (!SpecificsNeedsEncryption(encrypted_types, new_specifics) || |
!cryptographer->is_initialized()) { |
@@ -119,7 +120,7 @@ void WriteNode::SetTitle(const std::wstring& title) { |
// 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 { |