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/http/http_network_layer.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/http/http_network_layer.h')
| -rw-r--r-- | net/http/http_network_layer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index 7872fdd..63ae3f2 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -25,6 +25,7 @@ class NetLog; class ProxyService; class SpdySessionPool; class SSLConfigService; +class SSLHostInfoFactory; class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe { public: @@ -33,6 +34,7 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe { HttpNetworkLayer(ClientSocketFactory* socket_factory, HostResolver* host_resolver, DnsRRResolver* dnsrr_resolver, + SSLHostInfoFactory* ssl_host_info_factory, ProxyService* proxy_service, SSLConfigService* ssl_config_service, HttpAuthHandlerFactory* http_auth_handler_factory, @@ -44,6 +46,7 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe { ClientSocketFactory* socket_factory, HostResolver* host_resolver, DnsRRResolver* dnsrr_resolver, + SSLHostInfoFactory* ssl_host_info_factory, ProxyService* proxy_service, SSLConfigService* ssl_config_service, SpdySessionPool* spdy_session_pool, @@ -59,6 +62,7 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe { static HttpTransactionFactory* CreateFactory( HostResolver* host_resolver, DnsRRResolver* dnsrr_resolver, + SSLHostInfoFactory* ssl_host_info_factory, ProxyService* proxy_service, SSLConfigService* ssl_config_service, HttpAuthHandlerFactory* http_auth_handler_factory, @@ -96,6 +100,7 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe { // creating |session_|. HostResolver* host_resolver_; DnsRRResolver* dnsrr_resolver_; + SSLHostInfoFactory* ssl_host_info_factory_; scoped_refptr<ProxyService> proxy_service_; // The SSL config service being used for the session. |