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

chrome/browser/sync/syncable/nigori_util.h

Index: chrome/browser/sync/syncable/nigori_util.h
===================================================================
--- chrome/browser/sync/syncable/nigori_util.h	(revision 98834)
+++ chrome/browser/sync/syncable/nigori_util.h	(working copy)
@@ -15,11 +15,16 @@
 class Cryptographer;
 }
 
+namespace sync_pb {
+class EntitySpecifics;
+}
+
 namespace syncable {
 
 const char kEncryptedString[] = "encrypted";
 
 class BaseTransaction;
+class Entry;
 class ReadTransaction;
 class WriteTransaction;
 
@@ -43,6 +48,16 @@
     WriteTransaction* const trans,
     browser_sync::Cryptographer* cryptographer);
 
+// Returns true if the entry requires encryption but is not encrypted, false
+// otherwise. Note: this does not check that already encrypted entries are
+// encrypted with the proper key.
+bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
+                          const Entry& entry);
+
+// Same as EntryNeedsEncryption, but looks at specifics.
+bool SpecificsNeedsEncryption(const ModelTypeSet& encrypted_types,
+                              const sync_pb::EntitySpecifics& specifics);
+
 // Verifies all data of type |type| is encrypted appropriately.
 bool VerifyDataTypeEncryption(BaseTransaction* const trans,
                               browser_sync::Cryptographer* cryptographer,