[Sync] The cryptographer should be able to handle empty or old nigori nodes.

chrome/browser/sync/util/cryptographer.h

Index: chrome/browser/sync/util/cryptographer.h
diff --git a/chrome/browser/sync/util/cryptographer.h b/chrome/browser/sync/util/cryptographer.h
index e78e3f388a31bd7bed28d2b6ded37ab7d4151b01..6facb833b47b9093820bcf70959cd22fe574f6b4 100644
--- a/chrome/browser/sync/util/cryptographer.h
+++ b/chrome/browser/sync/util/cryptographer.h
@@ -182,8 +182,8 @@ class Cryptographer {
   // Return the set of encrypted types.
   syncable::ModelTypeSet GetEncryptedTypes() const;
 
-  // Forwards to SetEncryptedTypes.
-  void SetEncryptedTypesForTest(
+  // Forwards to MergeEncryptedTypes.
+  void MergeEncryptedTypesForTest(
       const syncable::ModelTypeSet& encrypted_types);
 
  private:
@@ -192,7 +192,7 @@ class Cryptographer {
 
   // Changes the set of encrypted types and emits a notification if

[akalin, 2011/11/17 11:29:18]

Update comment, maybe:

// Merges the given set with the current set of encrypted types and emits a
notification if necessary.

[Nicolas Zea, 2011/11/17 19:03:16]

Done.

   // necessary.
-  void SetEncryptedTypes(const syncable::ModelTypeSet& encrypted_types);
+  void MergeEncryptedTypes(const syncable::ModelTypeSet& encrypted_types);
 
   void EmitEncryptedTypesChangedNotification();