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, 4 insertions, 11 deletions

diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index de7ef59..2921b66 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -47,19 +47,12 @@ HttpAuthHandlerRegistryFactory::~HttpAuthHandlerRegistryFactory() {
                                        factory_map_.end());
 }
 
-void HttpAuthHandlerRegistryFactory::SetFilter(const std::string& scheme,
-                                               HttpAuthFilter* filter) {
-  HttpAuthHandlerFactory* factory = GetSchemeFactory(scheme);
-  if (factory)
-    factory->set_filter(filter);
-}
-
-const HttpAuthFilter* HttpAuthHandlerRegistryFactory::GetFilter(
-    const std::string& scheme) const {
+void HttpAuthHandlerRegistryFactory::SetURLSecurityManager(
+    const std::string& scheme,
+    const URLSecurityManager* security_manager) {
   HttpAuthHandlerFactory* factory = GetSchemeFactory(scheme);
   if (factory)
-    return factory->filter();
-  return NULL;
+    factory->set_url_security_manager(security_manager);
 }
 
 void HttpAuthHandlerRegistryFactory::RegisterSchemeFactory(