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

chrome/browser/sync/internal_api/write_node.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/internal_api/write_node.h"
 
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/sync/engine/nigori_util.h"
@@ skipping 33 matching lines @@
     out->append(" ");
 }
 
 bool WriteNode::UpdateEntryWithEncryption(
     browser_sync::Cryptographer* cryptographer,
     const sync_pb::EntitySpecifics& new_specifics,
     syncable::MutableEntry* entry) {
   syncable::ModelType type = syncable::GetModelTypeFromSpecifics(new_specifics);
   DCHECK_GE(type, syncable::FIRST_REAL_MODEL_TYPE);
   syncable::ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes();
-
   sync_pb::EntitySpecifics generated_specifics;
-  if (type == syncable::PASSWORDS ||        // Has own encryption scheme.
-      type == syncable::NIGORI ||           // Encrypted separately.
-      encrypted_types.count(type) == 0 ||
-      new_specifics.has_encrypted()) {
-    // No encryption required.
+  if (!SpecificsNeedsEncryption(encrypted_types, new_specifics) ||
+      !cryptographer->is_initialized()) {
+    // No encryption required or we are unable to encrypt.
     generated_specifics.CopyFrom(new_specifics);
   } else {
     // Encrypt new_specifics into generated_specifics.
     if (VLOG_IS_ON(2)) {
       scoped_ptr<DictionaryValue> value(entry->ToValue());
       std::string info;
       base::JSONWriter::Write(value.get(), true, &info);
       VLOG(2) << "Encrypting specifics of type "
               << syncable::ModelTypeToString(type)
               << " with content: "
               << info;
     }
-    if (!cryptographer->is_initialized())
-      return false;
     syncable::AddDefaultExtensionValue(type, &generated_specifics);
     if (!cryptographer->Encrypt(new_specifics,
                                 generated_specifics.mutable_encrypted())) {
       NOTREACHED() << "Could not encrypt data for node of type "
                    << syncable::ModelTypeToString(type);
       return false;
     }
   }
 
   const sync_pb::EntitySpecifics& old_specifics = entry->Get(SPECIFICS);
@@ skipping 446 matching lines @@
   sync_pb::BookmarkSpecifics new_value = GetBookmarkSpecifics();
   new_value.set_favicon(bytes.empty() ? NULL : &bytes[0], bytes.size());
   SetBookmarkSpecifics(new_value);
 }
 
 void WriteNode::MarkForSyncing() {
   syncable::MarkForSyncing(entry_);
 }
 
 } // namespace sync_api