Merge 98758 - [Sync] Gracefully handle writing to a node when the cryptographer is not ready.

chrome/browser/sync/syncable/nigori_util_unittest.cc

Index: chrome/browser/sync/syncable/nigori_util_unittest.cc
===================================================================
--- chrome/browser/sync/syncable/nigori_util_unittest.cc	(revision 98834)
+++ chrome/browser/sync/syncable/nigori_util_unittest.cc	(working copy)
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/sync/syncable/nigori_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -37,6 +38,36 @@
   EXPECT_EQ(encrypted_types, test_types);
 }
 
+TEST(NigoriUtilTest, SpecificsNeedsEncryption) {
+  ModelTypeSet encrypted_types;
+  encrypted_types.insert(BOOKMARKS);
+  encrypted_types.insert(PASSWORDS);
+
+  sync_pb::EntitySpecifics specifics;
+  EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), specifics));
+  EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));
+
+  AddDefaultExtensionValue(PREFERENCES, &specifics);
+  EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));
+
+  sync_pb::EntitySpecifics bookmark_specifics;
+  AddDefaultExtensionValue(BOOKMARKS, &bookmark_specifics);
+  EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));
+
+  bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_title("title");
+  bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_url("url");
+  EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));
+  EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));
+
+  bookmark_specifics.mutable_encrypted();
+  EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));
+  EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));
+
+  sync_pb::EntitySpecifics password_specifics;
+  AddDefaultExtensionValue(PASSWORDS, &password_specifics);
+  EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, password_specifics));
+}
+
 // ProcessUnsyncedChangesForEncryption and other methods that rely on the syncer
 // are tested in apply_updates_command_unittest.cc