Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3398)

Unified Diff: chrome/browser/sync/util/cryptographer_unittest.cc

Issue 8564032: [Sync] The cryptographer should be able to handle empty or old nigori nodes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 43a977122bd0700187baebba4c1a945d2ff4897c..9e4f12da6275ccc7ea89e25864287a1621d5a232 100644
--- a/chrome/browser/sync/util/cryptographer_unittest.cc
+++ b/chrome/browser/sync/util/cryptographer_unittest.cc
@@ -230,6 +230,15 @@ TEST(CryptographerTest, NigoriEncryptionTypes) {
cryptographer2.UpdateEncryptedTypesFromNigori(nigori);
EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes());
EXPECT_EQ(encrypted_types, cryptographer2.GetEncryptedTypes());
+
+ // Receiving an empty nigori should not reset any encrypted types.
+ Mock::VerifyAndClearExpectations(&observer);
+ EXPECT_CALL(observer,
+ OnEncryptedTypesChanged(syncable::GetAllRealModelTypes(),
+ false));
+ nigori = sync_pb::NigoriSpecifics();
+ cryptographer.UpdateEncryptedTypesFromNigori(nigori);
+ EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes());
}
TEST(CryptographerTest, EncryptEverythingExplicit) {
« chrome/browser/sync/util/cryptographer.cc ('K') | « chrome/browser/sync/util/cryptographer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698