diff options
Diffstat (limited to 'google_apis/gcm/engine/gcm_store_impl.cc')
| -rw-r--r-- | google_apis/gcm/engine/gcm_store_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc index efbb1f38..31b258f 100644 --- a/google_apis/gcm/engine/gcm_store_impl.cc +++ b/google_apis/gcm/engine/gcm_store_impl.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/tracked_objects.h" -#include "components/encryptor/encryptor.h" +#include "components/encryptor/os_crypt.h" #include "google_apis/gcm/base/mcs_message.h" #include "google_apis/gcm/base/mcs_util.h" #include "google_apis/gcm/protocol/mcs.pb.h" @@ -241,8 +241,8 @@ void GCMStoreImpl::Backend::SetDeviceCredentials( write_options.sync = true; std::string encrypted_token; - Encryptor::EncryptString(base::Uint64ToString(device_security_token), - &encrypted_token); + OSCrypt::EncryptString(base::Uint64ToString(device_security_token), + &encrypted_token); std::string android_id_str = base::Uint64ToString(device_android_id); leveldb::Status s = db_->Put(write_options, @@ -487,7 +487,7 @@ bool GCMStoreImpl::Backend::LoadDeviceCredentials(uint64* android_id, } if (s.ok()) { std::string decrypted_token; - Encryptor::DecryptString(result, &decrypted_token); + OSCrypt::DecryptString(result, &decrypted_token); if (!base::StringToUint64(decrypted_token, security_token)) { LOG(ERROR) << "Failed to restore security token."; return false; @@ -618,7 +618,7 @@ GCMStoreImpl::GCMStoreImpl( weak_ptr_factory_(this) { // On OSX, prevent the Keychain permissions popup during unit tests. #if defined(OS_MACOSX) - Encryptor::UseMockKeychain(use_mock_keychain); + OSCrypt::UseMockKeychain(use_mock_keychain); #endif } |