| 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;
|
| }
|
|
|
|
|