diff options
| author | ahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 17:27:10 +0000 |
|---|---|---|
| committer | ahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 17:27:10 +0000 |
| commit | 930cbb5855c54aedb590bc522963320c189a3e52 (patch) | |
| tree | 3d579aa9a2c65210b2c3453e32a0d2991d4bf2f9 /net/http/http_network_session.cc | |
| parent | e457f74143dcabf0663983cb376425f121a0dc84 (diff) | |
| download | chromium_src-930cbb5855c54aedb590bc522963320c189a3e52.zip chromium_src-930cbb5855c54aedb590bc522963320c189a3e52.tar.gz chromium_src-930cbb5855c54aedb590bc522963320c189a3e52.tar.bz2 | |
Added command-line whitelist data to UrlSecurityManager. These are used by all platforms; Windows will use IInternetSecurityManager if they are not present.
Removed registry code from HttpAuthFilterWhitelist, as we're now using a different method of authentication on Windows.
BUG=29596
TEST=None.
Review URL: http://codereview.chromium.org/1569010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.cc')
| -rw-r--r-- | net/http/http_network_session.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index 66b7854..3c44b81 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -58,8 +58,10 @@ HttpNetworkSession::~HttpNetworkSession() { URLSecurityManager* HttpNetworkSession::GetURLSecurityManager() { // Create the URL security manager lazily in the first call. // This is called on a single thread. - if (!url_security_manager_.get()) - url_security_manager_.reset(URLSecurityManager::Create()); + if (!url_security_manager_.get()) { + url_security_manager_.reset( + URLSecurityManager::Create(http_auth_handler_factory_->filter())); + } return url_security_manager_.get(); } |