[Sync] Fix encrypting of sync titles.

chrome/browser/sync/engine/nigori_util.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/engine/nigori_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
     if (EntryNeedsEncryption(encrypted_types, entry))
       return false;
   }
   return true;
 }
 
 bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
                           const Entry& entry) {
   if (!entry.Get(UNIQUE_SERVER_TAG).empty())
     return false;  // We don't encrypt unique server nodes.
-  return SpecificsNeedsEncryption(encrypted_types, entry.Get(SPECIFICS));
+  syncable::ModelType type = entry.GetModelType();
+  if (type == PASSWORDS || type == NIGORI)
+    return false;
+  // Checking NON_UNIQUE_NAME is not necessary for the correctness of encrypting
+  // the data, nor for determining if data is encrypted. We simply ensure it has
+  // been overwritten to avoid any possible leaks of sensitive data.
+  return SpecificsNeedsEncryption(encrypted_types, entry.Get(SPECIFICS)) ||
+         (encrypted_types.count(type) > 0 &&
+          entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
 }
 
 bool SpecificsNeedsEncryption(const ModelTypeSet& encrypted_types,
                               const sync_pb::EntitySpecifics& specifics) {
   ModelType type = GetModelTypeFromSpecifics(specifics);
   if (type == PASSWORDS || type == NIGORI)
     return false;  // These types have their own encryption schemes.
   if (encrypted_types.count(type) == 0)
     return false;  // This type does not require encryption
   return !specifics.has_encrypted();
@@ skipping 49 matching lines @@
           return false;
       }
     }
     // Push the successor.
     to_visit.push(child.Get(NEXT_ID));
   }
   return true;
 }
 
 }  // namespace syncable