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

chrome/browser/sync/util/cryptographer_unittest.cc

Index: chrome/browser/sync/util/cryptographer_unittest.cc
diff --git a/chrome/browser/sync/util/cryptographer_unittest.cc b/chrome/browser/sync/util/cryptographer_unittest.cc
index 9e4f12da6275ccc7ea89e25864287a1621d5a232..e35afab8306928a40ead6660a068216a308ddba2 100644
--- a/chrome/browser/sync/util/cryptographer_unittest.cc
+++ b/chrome/browser/sync/util/cryptographer_unittest.cc
@@ -207,7 +207,7 @@ TEST(CryptographerTest, NigoriEncryptionTypes) {
   // Just set the sensitive types (shouldn't trigger any
   // notifications).
   ModelTypeSet encrypted_types(Cryptographer::SensitiveTypes());
-  cryptographer.SetEncryptedTypesForTest(encrypted_types);
+  cryptographer.MergeEncryptedTypesForTest(encrypted_types);
   cryptographer.UpdateNigoriFromEncryptedTypes(&nigori);
   cryptographer2.UpdateEncryptedTypesFromNigori(nigori);
   EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes());
@@ -225,7 +225,7 @@ TEST(CryptographerTest, NigoriEncryptionTypes) {
 
   // Set all encrypted types
   encrypted_types = syncable::GetAllRealModelTypes();
-  cryptographer.SetEncryptedTypesForTest(encrypted_types);
+  cryptographer.MergeEncryptedTypesForTest(encrypted_types);
   cryptographer.UpdateNigoriFromEncryptedTypes(&nigori);
   cryptographer2.UpdateEncryptedTypesFromNigori(nigori);
   EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes());
@@ -233,9 +233,6 @@ TEST(CryptographerTest, NigoriEncryptionTypes) {
 
   // Receiving an empty nigori should not reset any encrypted types.
   Mock::VerifyAndClearExpectations(&observer);
-  EXPECT_CALL(observer,

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

What's up with this diff?  You added this new empty nigori test in this CL,
right?

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

Weird. Think git got confused as to which branch it was tracking. Fixed.

-              OnEncryptedTypesChanged(syncable::GetAllRealModelTypes(),
-                                      false));
   nigori = sync_pb::NigoriSpecifics();
   cryptographer.UpdateEncryptedTypesFromNigori(nigori);
   EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes());