summaryrefslogtreecommitdiffstats
path: root/net/http/http_auth_handler_ntlm.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 06:15:44 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 06:15:44 +0000
commit13c8a0903376ff406151679d8673a6452d721290 (patch)
treedbb5b8e9503f8d0ee447863089f3e6f23692910f /net/http/http_auth_handler_ntlm.cc
parent6b55570f03236557b8b966b08dfbdda1ea91aadc (diff)
downloadchromium_src-13c8a0903376ff406151679d8673a6452d721290.zip
chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.gz
chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.bz2
Net: Convert username and password to string16.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3040016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_handler_ntlm.cc')
-rw-r--r--net/http/http_auth_handler_ntlm.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc
index d8e8a75..3191df6 100644
--- a/net/http/http_auth_handler_ntlm.cc
+++ b/net/http/http_auth_handler_ntlm.cc
@@ -14,8 +14,8 @@
namespace net {
int HttpAuthHandlerNTLM::GenerateAuthTokenImpl(
- const std::wstring* username,
- const std::wstring* password,
+ const string16* username,
+ const string16* password,
const HttpRequestInfo* request,
CompletionCallback* callback,
std::string* auth_token) {
@@ -36,8 +36,8 @@ int HttpAuthHandlerNTLM::GenerateAuthTokenImpl(
// |username| may be in the form "DOMAIN\user". Parse it into the two
// components.
- std::wstring domain;
- std::wstring user;
+ string16 domain;
+ string16 user;
size_t backslash_idx = username->find(L'\\');
if (backslash_idx == std::wstring::npos) {
user = *username;
@@ -45,9 +45,9 @@ int HttpAuthHandlerNTLM::GenerateAuthTokenImpl(
domain = username->substr(0, backslash_idx);
user = username->substr(backslash_idx + 1);
}
- domain_ = WideToUTF16(domain);
- username_ = WideToUTF16(user);
- password_ = WideToUTF16(*password);
+ domain_ = domain;
+ username_ = user;
+ password_ = *password;
// Initial challenge.
if (auth_data_.empty()) {