diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 13:33:21 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 13:33:21 +0000 |
| commit | 7ab5bbd128a32d32046201df76b86d370efa65af (patch) | |
| tree | 69a234c16498a3a27acacc2c4681f783c4bd0975 /net/spdy/spdy_test_util.h | |
| parent | 0a0d806aa4c534ff999f6bac2503d76d1d38e38d (diff) | |
| download | chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.zip chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.tar.gz chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.tar.bz2 | |
Revert revert 62918 - net: clean up SSLHostInfo construction."
Was reverted in r62922 due to a change landing between the try run and the
commit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.h')
| -rw-r--r-- | net/spdy/spdy_test_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h index 8c3a1e5..e3e85c8 100644 --- a/net/spdy/spdy_test_util.h +++ b/net/spdy/spdy_test_util.h @@ -354,6 +354,7 @@ class SpdySessionDependencies { SpdySessionDependencies* session_deps) { return new HttpNetworkSession(session_deps->host_resolver.get(), NULL /* dnsrr_resolver */, + NULL /* ssl_host_info_factory */, session_deps->proxy_service, session_deps->socket_factory.get(), session_deps->ssl_config_service, @@ -366,6 +367,7 @@ class SpdySessionDependencies { SpdySessionDependencies* session_deps) { return new HttpNetworkSession(session_deps->host_resolver.get(), NULL /* dnsrr_resolver */, + NULL /* ssl_host_info_factory */, session_deps->proxy_service, session_deps-> deterministic_socket_factory.get(), @@ -389,6 +391,7 @@ class SpdyURLRequestContext : public URLRequestContext { new HttpNetworkLayer(&socket_factory_, host_resolver_, NULL /* dnsrr_resolver */, + NULL /* ssl_host_info_factory */, proxy_service_, ssl_config_service_, new SpdySessionPool(NULL), |