summaryrefslogtreecommitdiffstats
path: root/components/signin
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-28 18:34:10 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-28 18:34:10 +0000
commit92cdb1cac7927203a40feec6224b327a21ad8d42 (patch)
treefb2befac0bb0a63db4647824fca747a8e02a151e /components/signin
parentc73236512b5285e65eeda627f94ddce51fcda16f (diff)
downloadchromium_src-92cdb1cac7927203a40feec6224b327a21ad8d42.zip
chromium_src-92cdb1cac7927203a40feec6224b327a21ad8d42.tar.gz
chromium_src-92cdb1cac7927203a40feec6224b327a21ad8d42.tar.bz2
Rename components's Encryptor to OSEncrypt.
To avoid confusion with the Encryptor class that exists under crypto/. BUG=341293 TEST=None R=joi@chromium.org,bcwhite@chromium.org TBR=thestig Review URL: https://codereview.chromium.org/183953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/signin')
-rw-r--r--components/signin/core/webdata/token_service_table.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/signin/core/webdata/token_service_table.cc b/components/signin/core/webdata/token_service_table.cc
index bce7fe2..a455bc7 100644
--- a/components/signin/core/webdata/token_service_table.cc
+++ b/components/signin/core/webdata/token_service_table.cc
@@ -8,7 +8,7 @@
#include <string>
#include "base/logging.h"
-#include "components/encryptor/encryptor.h"
+#include "components/encryptor/os_crypt.h"
#include "components/webdata/common/web_database.h"
#include "sql/statement.h"
@@ -72,7 +72,7 @@ bool TokenServiceTable::RemoveTokenForService(const std::string& service) {
bool TokenServiceTable::SetTokenForService(const std::string& service,
const std::string& token) {
std::string encrypted_token;
- bool encrypted = Encryptor::EncryptString(token, &encrypted_token);
+ bool encrypted = OSCrypt::EncryptString(token, &encrypted_token);
if (!encrypted) {
return false;
}
@@ -105,7 +105,7 @@ bool TokenServiceTable::GetAllTokens(
bool entry_ok = !service.empty() &&
s.ColumnBlobAsString(1, &encrypted_token);
if (entry_ok) {
- Encryptor::DecryptString(encrypted_token, &decrypted_token);
+ OSCrypt::DecryptString(encrypted_token, &decrypted_token);
(*tokens)[service] = decrypted_token;
} else {
NOTREACHED();