diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
| commit | 978df34538607d50bf4690f2d679c1bef860398c (patch) | |
| tree | b99abc0b44316c0bfa16374746996ac209e363a6 /chrome/browser/importer | |
| parent | 391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff) | |
| download | chromium_src-978df34538607d50bf4690f2d679c1bef860398c.zip chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.gz chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.bz2 | |
Move base64 from 'net/base' into 'base'.
BUG=13572
TEST=none
Review URL: http://codereview.chromium.org/399068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/nss_decryptor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index db2c89f..38b1a66f 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -13,8 +13,8 @@ #include <pk11sdr.h> #endif // defined(OS_LINUX) +#include "base/base64.h" #include "base/string_util.h" -#include "net/base/base64.h" #include "webkit/glue/password_form.h" using webkit_glue::PasswordForm; @@ -69,7 +69,7 @@ string16 NSSDecryptor::Decrypt(const std::string& crypt) const { std::string plain; if (crypt[0] != '~') { std::string decoded_data; - net::Base64Decode(crypt, &decoded_data); + base::Base64Decode(crypt, &decoded_data); PK11SlotInfo* slot = GetKeySlotForDB(); SECStatus result = PK11_Authenticate(slot, PR_TRUE, NULL); if (result != SECSuccess) { @@ -96,7 +96,7 @@ string16 NSSDecryptor::Decrypt(const std::string& crypt) const { FreeSlot(slot); } else { // Deletes the leading '~' before decoding. - net::Base64Decode(crypt.substr(1), &plain); + base::Base64Decode(crypt.substr(1), &plain); } return UTF8ToUTF16(plain); |