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"

[asanka, 2011/10/28 14:39:40]

Not needed?

 #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 41 matching lines @@
   // 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,
+  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;

[asanka, 2011/10/28 14:39:40]

It's probably worthwhile putting in OVERRIDEs for the HttpAuthHandler derived
classes.

[cbentzel, 2011/10/28 15:58:07]

I agree to an extent - it's not as critical for overriding =0 since the compiler
will complain about not being able to create a class with pure virtual methods.
But I'll do it in a separate CL. 

 
   // 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_;
 
   // The auth challenge.
   std::string auth_challenge_;
 
@@ skipping 17 matching lines @@
   void OnGenerateAuthTokenComplete(int rv);
   void FinishGenerateAuthToken();
 
   OldCompletionCallback* original_callback_;
   OldCompletionCallbackImpl<HttpAuthHandler> wrapper_callback_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_H_