diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 21:48:34 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 21:48:34 +0000 |
| commit | 9e1bdd3f9785ed8a84a137c98b781ddaec41b080 (patch) | |
| tree | 36d3550cc6d9db08bf3a18fbb42668d440a94b56 /net/proxy | |
| parent | 966c57777b2c18313cddd8e36d109665f5377521 (diff) | |
| download | chromium_src-9e1bdd3f9785ed8a84a137c98b781ddaec41b080.zip chromium_src-9e1bdd3f9785ed8a84a137c98b781ddaec41b080.tar.gz chromium_src-9e1bdd3f9785ed8a84a137c98b781ddaec41b080.tar.bz2 | |
Refactor HttpNetworkSession construction.
Introduce HttpNetworkSession::Params. This should make it easy to add new optionally NULL parameters. I also took this opportunity to eliminate some copy/pastes of TestURLRequestContext and make them use the original. I was also able to remove the need for ClientSocketFactory::GetDefaultFactory() calls and new SpdySessionPool() calls in most places.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6349028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl_unittest.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index ae751eb..ce92986 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -16,8 +16,6 @@ #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" -#include "net/socket/client_socket_factory.h" -#include "net/spdy/spdy_session_pool.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -50,20 +48,13 @@ class RequestContext : public URLRequestContext { proxy_service_ = ProxyService::CreateFixed(no_proxy); ssl_config_service_ = new SSLConfigServiceDefaults; + HttpNetworkSession::Params params; + params.host_resolver = host_resolver_; + params.cert_verifier = cert_verifier_; + params.proxy_service = proxy_service_; + params.ssl_config_service = ssl_config_service_; scoped_refptr<HttpNetworkSession> network_session( - new HttpNetworkSession( - host_resolver_, - cert_verifier_, - NULL /* dnsrr_resolver */, - NULL /* dns_cert_checker */, - NULL /* ssl_host_info_factory */, - proxy_service_, - ClientSocketFactory::GetDefaultFactory(), - ssl_config_service_, - new SpdySessionPool(NULL), - NULL, - NULL, - NULL)); + new HttpNetworkSession(params)); http_transaction_factory_ = new HttpCache( network_session, HttpCache::DefaultBackend::InMemory(0)); |