Reland 89038, but with a mocked out keychain (mac unit tests were timing out)

chrome/browser/sync/util/cryptographer.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 "base/base64.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 
 namespace browser_sync {
 
@@ skipping 26 matching lines @@
   return nigoris_.end() != nigoris_.find(data.key_name());
 }
 
 bool Cryptographer::CanDecryptUsingDefaultKey(
     const sync_pb::EncryptedData& data) const {
   return default_nigori_ && (data.key_name() == default_nigori_->first);
 }
 
 bool Cryptographer::Encrypt(const ::google::protobuf::MessageLite& message,
                             sync_pb::EncryptedData* encrypted) const {
-  DCHECK(encrypted);
-  DCHECK(default_nigori_);
+  if (!encrypted || !default_nigori_) {
+    LOG(ERROR) << "Cryptographer not ready, failed to encrypt.";
+    return false;
+  }
 
   std::string serialized;
   if (!message.SerializeToString(&serialized)) {
-    NOTREACHED();  // |message| is invalid/missing a required field.
+    LOG(ERROR) << "Message is invalid/missing a required field.";
     return false;
   }
 
   encrypted->set_key_name(default_nigori_->first);
   if (!default_nigori_->second->Encrypt(serialized,
                                         encrypted->mutable_blob())) {
-    NOTREACHED();  // Encrypt should not fail.
+    LOG(ERROR) << "Failed to encrypt data.";
     return false;
   }
   return true;
 }
 
 bool Cryptographer::Decrypt(const sync_pb::EncryptedData& encrypted,
                             ::google::protobuf::MessageLite* message) const {
   DCHECK(message);
   std::string plaintext = DecryptToString(encrypted);
   return message->ParseFromString(plaintext);
@@ skipping 229 matching lines @@
         continue;
       }
       nigoris_[key.name()] = make_linked_ptr(new_nigori.release());
     }
   }
   DCHECK(nigoris_.end() != nigoris_.find(default_key_name));
   default_nigori_ = &*nigoris_.find(default_key_name);
 }
 
 }  // namespace browser_sync