summaryrefslogtreecommitdiffstats
path: root/net/http/http_auth_handler_ntlm.cc
diff options
context:
space:
mode:
authorhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
committerhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
commit978df34538607d50bf4690f2d679c1bef860398c (patch)
treeb99abc0b44316c0bfa16374746996ac209e363a6 /net/http/http_auth_handler_ntlm.cc
parent391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff)
downloadchromium_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_ntlm.cc')
-rw-r--r--net/http/http_auth_handler_ntlm.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc
index 99488ba..3dcf9b4 100644
--- a/net/http/http_auth_handler_ntlm.cc
+++ b/net/http/http_auth_handler_ntlm.cc
@@ -4,8 +4,8 @@
#include "net/http/http_auth_handler_ntlm.h"
+#include "base/base64.h"
#include "base/string_util.h"
-#include "net/base/base64.h"
#include "net/base/net_errors.h"
namespace net {
@@ -57,7 +57,7 @@ std::string HttpAuthHandlerNTLM::GenerateCredentials(
len--;
auth_data_.erase(len);
- if (!Base64Decode(auth_data_, &decoded_auth_data))
+ if (!base::Base64Decode(auth_data_, &decoded_auth_data))
return std::string(); // Improper base64 encoding
in_buf_len = decoded_auth_data.length();
in_buf = decoded_auth_data.data();
@@ -70,7 +70,7 @@ std::string HttpAuthHandlerNTLM::GenerateCredentials(
// Base64 encode data in output buffer and prepend "NTLM ".
std::string encode_input(static_cast<char*>(out_buf), out_buf_len);
std::string encode_output;
- bool ok = Base64Encode(encode_input, &encode_output);
+ bool ok = base::Base64Encode(encode_input, &encode_output);
// OK, we are done with |out_buf|
free(out_buf);
if (!ok)