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

net/http/http_auth_handler_negotiate.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_NEGOTIATE_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NEGOTIATE_H_
 #pragma once
 
 #include <string>
 
 #include "base/string16.h"

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

base/string16.h not needed anymore.

 #include "build/build_config.h"
 #include "net/base/address_list.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 
 #if defined(OS_WIN)
 #include "net/http/http_auth_sspi_win.h"
 #elif defined(OS_POSIX)
 #include "net/http/http_auth_gssapi_posix.h"
@@ skipping 87 matching lines @@
   // HttpAuthHandler:
   virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
       HttpAuth::ChallengeTokenizer* challenge) OVERRIDE;
   virtual bool NeedsIdentity() OVERRIDE;
   virtual bool AllowsDefaultCredentials() OVERRIDE;
   virtual bool AllowsExplicitCredentials() OVERRIDE;
 
  protected:
   virtual bool Init(HttpAuth::ChallengeTokenizer* challenge);
 
-  virtual int GenerateAuthTokenImpl(const string16* username,
-                                    const string16* password,
+  virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials,
                                     const HttpRequestInfo* request,
                                     OldCompletionCallback* callback,
                                     std::string* auth_token);
 
  private:
   enum State {
     STATE_RESOLVE_CANONICAL_NAME,
     STATE_RESOLVE_CANONICAL_NAME_COMPLETE,
     STATE_GENERATE_AUTH_TOKEN,
     STATE_GENERATE_AUTH_TOKEN_COMPLETE,
@@ skipping 15 matching lines @@
   bool use_port_;
   OldCompletionCallbackImpl<HttpAuthHandlerNegotiate> io_callback_;
   HostResolver* const resolver_;
 
   // Members which are needed for DNS lookup + SPN.
   AddressList address_list_;
   scoped_ptr<SingleRequestHostResolver> single_resolve_;
 
   // Things which should be consistent after first call to GenerateAuthToken.
   bool already_called_;
-  bool has_username_and_password_;
-  string16 username_;
-  string16 password_;
+  bool has_credentials_;
+  AuthCredentials credentials_;
   std::wstring spn_;
 
   // Things which vary each round.
   OldCompletionCallback* user_callback_;
   std::string* auth_token_;
 
   State next_state_;
 
   const URLSecurityManager* url_security_manager_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_NEGOTIATE_H_