Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1845)

Unified Diff: net/http/http_auth_handler_basic.cc

Issue 399068: Move base64 from 'net/base' into 'base'. (Closed)
Patch Set: rebase Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/strict_transport_security_state.cc ('k') | net/http/http_auth_handler_ntlm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_handler_basic.cc
diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc
index 0052dbf53fa5e1433243f21a2de138e08b5952b9..71c310c4a1f7cfcc2c738c3c3c0da9284321f821 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;
}
« no previous file with comments | « net/base/strict_transport_security_state.cc ('k') | net/http/http_auth_handler_ntlm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698