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

net/http/http_auth_handler.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_H_
 #pragma once
 
 #include <string>
 
-#include "base/string16.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/http/http_auth.h"
 
 namespace net {
 
 struct HttpRequestInfo;
 
 // HttpAuthHandler is the interface for the authentication schemes
@@ skipping 25 matching lines @@
   // be made with a different nonce provided in the challenge.
   //
   // |challenge| must be non-NULL and have already tokenized the
   // authentication scheme, but none of the tokens occuring after the
   // authentication scheme.
   virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
       HttpAuth::ChallengeTokenizer* challenge) = 0;
 
   // Generates an authentication token, potentially asynchronously.
   //
-  // When |username| and |password| are NULL, the default credentials for
-  // the currently logged in user are used. |AllowsDefaultCredentials()| MUST be
-  // true in this case.
+  // When |credentials| is NULL, the default credentials for the currently
+  // logged in user are used. |AllowsDefaultCredentials()| MUST be true in this
+  // case.
   //
   // |request|, |callback|, and |auth_token| must be non-NULL.
   //
   // The return value is a net error code.
+  //
   // If |OK| is returned, |*auth_token| is filled in with an authentication
   // token which can be inserted in the HTTP request.
+  //
   // If |ERR_IO_PENDING| is returned, |*auth_token| will be filled in
   // asynchronously and |callback| will be invoked. The lifetime of
   // |request|, |callback|, and |auth_token| must last until |callback| is
-  // invoked, but |username| and |password| are only used during the initial
-  // call.
-  // Otherwise, there was a problem generating a token synchronously, and the
-  // value of |*auth_token| is unspecified.
-  int GenerateAuthToken(const string16* username,
-                        const string16* password,
+  // invoked, but |credentials| is only used during the initial call.
+  //
+  // All other return codes indicate that there was a problem generating a
+  // token, and the value of |*auth_token| is unspecified.
+  int GenerateAuthToken(const AuthCredentials* credentials,
                         const HttpRequestInfo* request,
                         OldCompletionCallback* callback,
                         std::string* auth_token);
 
   // The authentication scheme as an enumerated value.
   HttpAuth::Scheme auth_scheme() const {
     return auth_scheme_;
   }
 
   // The realm, encoded as UTF-8. This may be empty.
@@ skipping 65 matching lines @@
   // |challenge| must be non-NULL and have already tokenized the
   // authentication scheme, but none of the tokens occuring after the
   // authentication scheme.
   // Implementations are expcted to initialize the following members:
   // scheme_, realm_, score_, properties_
   virtual bool Init(HttpAuth::ChallengeTokenizer* challenge) = 0;
 
   // |GenerateAuthTokenImpl()} is the auth-scheme specific implementation
   // of generating the next auth token. Callers sohuld use |GenerateAuthToken()|
   // which will in turn call |GenerateAuthTokenImpl()|
-  virtual int GenerateAuthTokenImpl(const string16* username,
-                                    const string16* password,
+  virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials,
                                     const HttpRequestInfo* request,
                                     OldCompletionCallback* callback,
                                     std::string* auth_token) = 0;
 
   // The auth-scheme as an enumerated value.
   HttpAuth::Scheme auth_scheme_;
 
   // The realm, encoded as UTF-8. Used by "basic" and "digest".
   std::string realm_;
 
@@ skipping 20 matching lines @@
   void OnGenerateAuthTokenComplete(int rv);
   void FinishGenerateAuthToken();
 
   OldCompletionCallback* original_callback_;
   OldCompletionCallbackImpl<HttpAuthHandler> wrapper_callback_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_H_