[Sync] Fix encrypting of sync titles.

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 59 matching lines @@
     syncable::AddDefaultExtensionValue(type, &generated_specifics);
     if (!cryptographer->Encrypt(new_specifics,
                                 generated_specifics.mutable_encrypted())) {
       NOTREACHED() << "Could not encrypt data for node of type "
                    << syncable::ModelTypeToString(type);
       return false;
     }
   }
 
   const sync_pb::EntitySpecifics& old_specifics = entry->Get(SPECIFICS);
-  if (AreSpecificsEqual(cryptographer, old_specifics, generated_specifics)) {
+  if (AreSpecificsEqual(cryptographer, old_specifics, generated_specifics) &&
+      (entry->Get(syncable::NON_UNIQUE_NAME) == kEncryptedString ||
+       !generated_specifics.has_encrypted())) {
     // Even if the data is the same but the old specifics are encrypted with an
     // old key, we should go ahead and re-encrypt with the new key.
     if ((!old_specifics.has_encrypted() &&
          !generated_specifics.has_encrypted()) ||
          cryptographer->CanDecryptUsingDefaultKey(old_specifics.encrypted())) {
       VLOG(2) << "Specifics of type " << syncable::ModelTypeToString(type)
               << " already match, dropping change.";
       return true;
     }
     // TODO(zea): Add some way to keep track of how often we're reencrypting
@@ skipping 30 matching lines @@
   sync_pb::EntitySpecifics specifics = GetEntitySpecifics();
   std::string server_legal_name;
   SyncAPINameToServerName(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.
-  if (specifics.has_encrypted()) {
+  Cryptographer* cryptographer = GetTransaction()->GetCryptographer();
+  if (cryptographer->GetEncryptedTypes().count(GetModelType()) > 0) {
     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 384 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