Use AuthCredentials throughout the network stack instead of username/password.

net/http/http_auth_handler_ntlm.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_auth_handler_ntlm.h"
 
 #if !defined(NTLM_SSPI)
 #include "base/base64.h"
 #endif
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 
 bool HttpAuthHandlerNTLM::Init(HttpAuth::ChallengeTokenizer* tok) {
   auth_scheme_ = HttpAuth::AUTH_SCHEME_NTLM;
   score_ = 3;
   properties_ = ENCRYPTS_IDENTITY | IS_CONNECTION_BASED;
 
   return ParseChallenge(tok, true) == HttpAuth::AUTHORIZATION_RESULT_ACCEPT;
 }
 
 int HttpAuthHandlerNTLM::GenerateAuthTokenImpl(
-    const string16* username,
-    const string16* password,
+    const AuthCredentials* credentials,
     const HttpRequestInfo* request,
     OldCompletionCallback* callback,
     std::string* auth_token) {
 #if defined(NTLM_SSPI)
   return auth_sspi_.GenerateAuthToken(
-      username,
-      password,
+      credentials,
       CreateSPN(origin_),
       auth_token);
 #else  // !defined(NTLM_SSPI)
   // TODO(cbentzel): Shouldn't be hitting this case.
-  if (!username || !password) {
+  if (!credentials) {
     LOG(ERROR) << "Username and password are expected to be non-NULL.";
     return ERR_MISSING_AUTH_CREDENTIALS;
   }
   // TODO(wtc): See if we can use char* instead of void* for in_buf and
   // out_buf.  This change will need to propagate to GetNextToken,
   // GenerateType1Msg, and GenerateType3Msg, and perhaps further.
   const void* in_buf;
   void* out_buf;
   uint32 in_buf_len, out_buf_len;
   std::string decoded_auth_data;
 
-  // |username| may be in the form "DOMAIN\user".  Parse it into the two
+  // The username may be in the form "DOMAIN\user".  Parse it into the two
   // components.
   string16 domain;
   string16 user;
+  const string16& username = credentials->username();
   const char16 backslash_character = '\\';
-  size_t backslash_idx = username->find(backslash_character);
+  size_t backslash_idx = username.find(backslash_character);
   if (backslash_idx == string16::npos) {
-    user = *username;
+    user = username;
   } else {
-    domain = username->substr(0, backslash_idx);
-    user = username->substr(backslash_idx + 1);
+    domain = username.substr(0, backslash_idx);
+    user = username.substr(backslash_idx + 1);
   }
   domain_ = domain;
-  username_ = user;
-  password_ = *password;
+  credentials_.Set(user, credentials->password());
 
   // Initial challenge.
   if (auth_data_.empty()) {
     in_buf_len = 0;
     in_buf = NULL;
     int rv = InitializeBeforeFirstChallenge();
     if (rv != OK)
       return rv;
   } else {
     if (!base::Base64Decode(auth_data_, &decoded_auth_data)) {
@@ skipping 60 matching lines @@
 // static
 std::wstring HttpAuthHandlerNTLM::CreateSPN(const GURL& origin) {
   // The service principal name of the destination server.  See
   // http://msdn.microsoft.com/en-us/library/ms677949%28VS.85%29.aspx
   std::wstring target(L"HTTP/");
   target.append(ASCIIToWide(GetHostAndPort(origin)));
   return target;
 }
 
 }  // namespace net