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

net/http/http_auth_handler_mock.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_MOCK_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"

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

Is base/string16.h needed anymore?

 #include "googleurl/src/gurl.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 
 namespace net {
 
 class HostResolver;
 
 // MockAuthHandler is used in tests to reliably trigger edge cases.
 class HttpAuthHandlerMock : public HttpAuthHandler {
@@ skipping 66 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:
   void OnResolveCanonicalName();
 
   void OnGenerateAuthToken();
 
   Resolve resolve_;
   OldCompletionCallback* user_callback_;
   base::WeakPtrFactory<HttpAuthHandlerMock> ptr_factory_;
   bool generate_async_;
   int generate_rv_;
   std::string* auth_token_;
   bool first_round_;
   bool connection_based_;
   bool allows_default_credentials_;
   bool allows_explicit_credentials_;
   GURL request_url_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_