Refactored to pass the URLSecurityManager via the HttpAuthFactory class to the HttpNetworkSession.

Fixed a bug where the command-line whitelist was not being propagated down to the URLSecurityManager.

BUG=29596
TEST=None

Review URL: http://codereview.chromium.org/1634005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44811 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/net/http/http_auth_handler_negotiate.h b/net/http/http_auth_handler_negotiate.h
index 3450fc4..7bb9426 100644
--- a/net/http/http_auth_handler_negotiate.h
+++ b/net/http/http_auth_handler_negotiate.h
@@ -20,6 +20,7 @@
 namespace net {
 
 class SingleRequestHostResolver;
+class URLSecurityManager;
 
 // Handler for WWW-Authenticate: Negotiate protocol.
 //
@@ -78,16 +79,18 @@ class HttpAuthHandlerNegotiate : public HttpAuthHandler {
 
 #if defined(OS_WIN)
   HttpAuthHandlerNegotiate(SSPILibrary* sspi_library, ULONG max_token_length,
+                           const URLSecurityManager* url_security_manager,
                            bool disable_cname_lookup, bool use_port);
 #else
-  HttpAuthHandlerNegotiate();
+  explicit HttpAuthHandlerNegotiate(
+      const URLSecurityManager* url_security_manager);
 #endif
 
   virtual bool NeedsIdentity();
 
   virtual bool IsFinalRound();
 
-  virtual bool SupportsDefaultCredentials();
+  virtual bool AllowsDefaultCredentials();
 
   virtual bool NeedsCanonicalName();
 
@@ -124,6 +127,8 @@ class HttpAuthHandlerNegotiate : public HttpAuthHandler {
   bool use_port_;
   std::wstring spn_;
 #endif
+
+  const URLSecurityManager* url_security_manager_;
 };
 
 }  // namespace net