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, 3 insertions, 21 deletions

diff --git a/net/http/url_security_manager_posix.cc b/net/http/url_security_manager_posix.cc
index 5a52576..931d9cc 100644
--- a/net/http/url_security_manager_posix.cc
+++ b/net/http/url_security_manager_posix.cc
@@ -2,34 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/http/http_auth.h"
-#include "net/http/http_auth_filter.h"
 #include "net/http/url_security_manager.h"
 
-#include "googleurl/src/gurl.h"
+#include "net/http/http_auth_filter.h"
 
 namespace net {
 
-class URLSecurityManagerPosix : public URLSecurityManager {
- public:
-  explicit URLSecurityManagerPosix(const HttpAuthFilter* whitelist)
-      : URLSecurityManager(whitelist) {}
-
-  // URLSecurityManager methods:
-  virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const;
-};
-
-bool URLSecurityManagerPosix::CanUseDefaultCredentials(
-    const GURL& auth_origin) const {
-  if (whitelist_)
-    return whitelist_->IsValid(auth_origin, HttpAuth::AUTH_SERVER);
-  return false;
-}
-
 // static
 URLSecurityManager* URLSecurityManager::Create(
-    const HttpAuthFilter* whitelist) {
-  return new URLSecurityManagerPosix(whitelist);
+    HttpAuthFilter* whitelist) {
+  return new URLSecurityManagerWhitelist(whitelist);
 }
 
 }  //  namespace net