Revert of sync: Add non-blocking type encryption support

sync/util/cryptographer.cc

 // Copyright (c) 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/util/cryptographer.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 233 matching lines @@
   }
   InstallKeyBag(bag);
   const std::string& new_default_key_name = pending_keys_->key_name();
   SetDefaultKey(new_default_key_name);
   pending_keys_.reset();
   return true;
 }
 
 bool Cryptographer::GetBootstrapToken(std::string* token) const {
   DCHECK(token);
-  std::string unencrypted_token = GetDefaultNigoriKeyData();
+  std::string unencrypted_token = GetDefaultNigoriKey();
   if (unencrypted_token.empty())
     return false;
 
   std::string encrypted_token;
   if (!encryptor_->EncryptString(unencrypted_token, &encrypted_token)) {
     NOTREACHED();
     return false;
   }
 
   base::Base64Encode(encrypted_token, token);
@@ skipping 52 matching lines @@
   if (!Decrypt(encrypted_bag, &bag)) {
     LOG(ERROR) << "Failed to decrypt keybag for stale check. "
                << "Assuming keybag is corrupted.";
     return true;
   }
   if (static_cast<size_t>(bag.key_size()) < nigoris_.size())
     return true;
   return false;
 }
 
-std::string Cryptographer::GetDefaultNigoriKeyName() const {
-  return default_nigori_name_;
-}
-
-std::string Cryptographer::GetDefaultNigoriKeyData() const {
+std::string Cryptographer::GetDefaultNigoriKey() const {
   if (!is_initialized())
     return std::string();
   NigoriMap::const_iterator iter = nigoris_.find(default_nigori_name_);
   if (iter == nigoris_.end())
     return std::string();
   sync_pb::NigoriKey key;
   if (!iter->second->ExportKeys(key.mutable_user_key(),
                                 key.mutable_encryption_key(),
                                 key.mutable_mac_key()))
     return std::string();
@@ skipping 14 matching lines @@
     NOTREACHED();
     return false;
   }
 
   if (!AddKeyImpl(nigori.Pass(), true))
     return false;
   return true;
 }
 
 }  // namespace syncer