summaryrefslogtreecommitdiffstats
path: root/net/http/http_auth_handler_ntlm.cc
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 19:28:20 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 19:28:20 +0000
commit294f0b4e4d5ec0ed44de161f72fd678f46330781 (patch)
treea63406989f9e759fd9538350ba334d8e215a47fa /net/http/http_auth_handler_ntlm.cc
parent2ff0bd0c84d84fcc67eab666e760978a84984ed1 (diff)
downloadchromium_src-294f0b4e4d5ec0ed44de161f72fd678f46330781.zip
chromium_src-294f0b4e4d5ec0ed44de161f72fd678f46330781.tar.gz
chromium_src-294f0b4e4d5ec0ed44de161f72fd678f46330781.tar.bz2
Leftovers from wstring->string16 conversion in authentication code.
I'm really confused how this even compiled in the first case (such as the npos comparison). BUG=50517 TEST=net_unittests, tested on Ubuntu against NTLM server + proxy. Review URL: http://codereview.chromium.org/2808107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_handler_ntlm.cc')
-rw-r--r--net/http/http_auth_handler_ntlm.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc
index 3191df6..9032bb5 100644
--- a/net/http/http_auth_handler_ntlm.cc
+++ b/net/http/http_auth_handler_ntlm.cc
@@ -38,8 +38,9 @@ int HttpAuthHandlerNTLM::GenerateAuthTokenImpl(
// components.
string16 domain;
string16 user;
- size_t backslash_idx = username->find(L'\\');
- if (backslash_idx == std::wstring::npos) {
+ const char16 backslash_character = '\\';
+ size_t backslash_idx = username->find(backslash_character);
+ if (backslash_idx == string16::npos) {
user = *username;
} else {
domain = username->substr(0, backslash_idx);