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

net/http/http_auth_sspi_win.cc

 // Copyright (c) 2011 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.
 
 // See "SSPI Sample Application" at
 // http://msdn.microsoft.com/en-us/library/aa918273.aspx
 
 #include "net/http/http_auth_sspi_win.h"
 
 #include "base/base64.h"
@@ skipping 236 matching lines @@
   }
 
   std::string decoded_auth_token;
   bool base64_rv = base::Base64Decode(encoded_auth_token, &decoded_auth_token);
   if (!base64_rv)
     return HttpAuth::AUTHORIZATION_RESULT_INVALID;
   decoded_server_auth_token_ = decoded_auth_token;
   return HttpAuth::AUTHORIZATION_RESULT_ACCEPT;
 }
 
-int HttpAuthSSPI::GenerateAuthToken(const string16* username,
-                                    const string16* password,
+int HttpAuthSSPI::GenerateAuthToken(const AuthCredentials* credentials,
                                     const std::wstring& spn,
                                     std::string* auth_token) {
-  DCHECK((username == NULL) == (password == NULL));
-
   // Initial challenge.
   if (!SecIsValidHandle(&cred_)) {
-    int rv = OnFirstRound(username, password);
+    int rv = OnFirstRound(credentials);
     if (rv != OK)
       return rv;
   }
 
   DCHECK(SecIsValidHandle(&cred_));
   void* out_buf;
   int out_buf_len;
   int rv = GetNextSecurityToken(
       spn,
       static_cast<void *>(const_cast<char *>(
@@ skipping 11 matching lines @@
   // OK, we are done with |out_buf|
   free(out_buf);
   if (!base64_rv) {
     LOG(ERROR) << "Base64 encoding of auth token failed.";
     return ERR_ENCODING_CONVERSION_FAILED;
   }
   *auth_token = scheme_ + " " + encode_output;
   return OK;
 }
 
-int HttpAuthSSPI::OnFirstRound(const string16* username,
-                               const string16* password) {
-  DCHECK((username == NULL) == (password == NULL));
+int HttpAuthSSPI::OnFirstRound(const AuthCredentials* credentials) {
   DCHECK(!SecIsValidHandle(&cred_));
   int rv = OK;
-  if (username) {
+  if (credentials) {
     string16 domain;
     string16 user;
-    SplitDomainAndUser(*username, &domain, &user);
+    SplitDomainAndUser(credentials->username(), &domain, &user);
     rv = AcquireExplicitCredentials(library_, security_package_, domain,
-                                    user, *password, &cred_);
+                                    user, credentials->password(), &cred_);
     if (rv != OK)
       return rv;
   } else {
     rv = AcquireDefaultCredentials(library_, security_package_, &cred_);
     if (rv != OK)
       return rv;
   }
 
   return rv;
 }
@@ skipping 107 matching lines @@
   int token_length = pkg_info->cbMaxToken;
   status = library->FreeContextBuffer(pkg_info);
   rv = MapFreeContextBufferStatusToError(status);
   if (rv != OK)
     return rv;
   *max_token_length = token_length;
   return OK;
 }
 
 }  // namespace net