sync: Add non-blocking type encryption (retry)

sync/internal_api/sync_encryption_handler_impl.cc

 // Copyright 2012 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 "sync/internal_api/sync_encryption_handler_impl.h"
 
 #include <queue>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 1501 matching lines @@
 }
 
 bool SyncEncryptionHandlerImpl::GetKeystoreDecryptor(
     const Cryptographer& cryptographer,
     const std::string& keystore_key,
     sync_pb::EncryptedData* encrypted_blob) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!keystore_key.empty());
   DCHECK(cryptographer.is_ready());
   std::string serialized_nigori;
-  serialized_nigori = cryptographer.GetDefaultNigoriKey();
+  serialized_nigori = cryptographer.GetDefaultNigoriKeyData();
   if (serialized_nigori.empty()) {
     LOG(ERROR) << "Failed to get cryptographer bootstrap token.";
     return false;
   }
   Cryptographer temp_cryptographer(cryptographer.encryptor());
   KeyParams key_params = {"localhost", "dummy", keystore_key};
   if (!temp_cryptographer.AddKey(key_params))
     return false;
   if (!temp_cryptographer.EncryptString(serialized_nigori, encrypted_blob))
     return false;
@@ skipping 105 matching lines @@
 
 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const {
   if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE)
     return migration_time();
   else if (passphrase_type_ == CUSTOM_PASSPHRASE)
     return custom_passphrase_time();
   return base::Time();
 }
 
 }  // namespace browser_sync