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 /net/http/http_auth_handler_basic.cc | |
| 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 'net/http/http_auth_handler_basic.cc')
| -rw-r--r-- | net/http/http_auth_handler_basic.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc index 0052dbf..71c310c 100644 --- a/net/http/http_auth_handler_basic.cc +++ b/net/http/http_auth_handler_basic.cc @@ -4,9 +4,11 @@ #include "net/http/http_auth_handler_basic.h" +#include <string> + +#include "base/base64.h" #include "base/string_util.h" #include "net/http/http_auth.h" -#include "net/base/base64.h" namespace net { @@ -46,9 +48,9 @@ std::string HttpAuthHandlerBasic::GenerateCredentials( const ProxyInfo*) { // TODO(eroman): is this the right encoding of username/password? std::string base64_username_password; - if (!Base64Encode(WideToUTF8(username) + ":" + WideToUTF8(password), - &base64_username_password)) - return std::string(); // FAIL + if (!base::Base64Encode(WideToUTF8(username) + ":" + WideToUTF8(password), + &base64_username_password)) + return std::string(); // FAIL return std::string("Basic ") + base64_username_password; } |