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

net/http/http_auth_handler.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.
 
 #include "net/http/http_auth_handler.h"
 
 #include "base/logging.h"
 #include "net/base/net_errors.h"
 
 namespace net {
@@ skipping 44 matching lines @@
     case HttpAuth::AUTH_SERVER:
       return NetLog::TYPE_AUTH_SERVER;
     default:
       NOTREACHED();
       return NetLog::TYPE_CANCELLED;
   }
 }
 
 }  // namespace
 
-int HttpAuthHandler::GenerateAuthToken(const string16* username,
-                                       const string16* password,
+int HttpAuthHandler::GenerateAuthToken(const AuthCredentials* credentials,
                                        const HttpRequestInfo* request,
                                        OldCompletionCallback* callback,
                                        std::string* auth_token) {
   // TODO(cbentzel): Enforce non-NULL callback after cleaning up SocketStream.
   DCHECK(request);
-  DCHECK((username == NULL) == (password == NULL));
-  DCHECK(username != NULL || AllowsDefaultCredentials());
+  DCHECK(credentials != NULL || AllowsDefaultCredentials());
   DCHECK(auth_token != NULL);
   DCHECK(original_callback_ == NULL);
   original_callback_ = callback;
   net_log_.BeginEvent(EventTypeFromAuthTarget(target_), NULL);
-  int rv = GenerateAuthTokenImpl(username, password, request,
+  int rv = GenerateAuthTokenImpl(credentials, request,
                                  &wrapper_callback_, auth_token);
   if (rv != ERR_IO_PENDING)
     FinishGenerateAuthToken();
   return rv;
 }
 
 bool HttpAuthHandler::NeedsIdentity() {
   return true;
 }
 
@@ skipping 12 matching lines @@
     callback->Run(rv);
 }
 
 void HttpAuthHandler::FinishGenerateAuthToken() {
   // TOOD(cbentzel): Should this be done in OK case only?
   net_log_.EndEvent(EventTypeFromAuthTarget(target_), NULL);
   original_callback_ = NULL;
 }
 
 }  // namespace net