diff options
Diffstat (limited to 'net/http/http_cache.cc')
-rw-r--r-- | net/http/http_cache.cc | 66 |
1 files changed, 4 insertions, 62 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 8579471..f7dfc2d 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -38,39 +38,6 @@ namespace net { -namespace { - -HttpNetworkSession* CreateNetworkSession( - HostResolver* host_resolver, - CertVerifier* cert_verifier, - ServerBoundCertService* server_bound_cert_service, - TransportSecurityState* transport_security_state, - ProxyService* proxy_service, - const std::string& ssl_session_cache_shard, - SSLConfigService* ssl_config_service, - HttpAuthHandlerFactory* http_auth_handler_factory, - NetworkDelegate* network_delegate, - HttpServerProperties* http_server_properties, - NetLog* net_log, - const std::string& trusted_spdy_proxy) { - HttpNetworkSession::Params params; - params.host_resolver = host_resolver; - params.cert_verifier = cert_verifier; - params.server_bound_cert_service = server_bound_cert_service; - params.transport_security_state = transport_security_state; - params.proxy_service = proxy_service; - params.ssl_session_cache_shard = ssl_session_cache_shard; - params.ssl_config_service = ssl_config_service; - params.http_auth_handler_factory = http_auth_handler_factory; - params.network_delegate = network_delegate; - params.http_server_properties = http_server_properties; - params.net_log = net_log; - params.trusted_spdy_proxy = trusted_spdy_proxy; - return new HttpNetworkSession(params); -} - -} // namespace - HttpCache::DefaultBackend::DefaultBackend(CacheType type, const FilePath& path, int max_bytes, @@ -275,38 +242,13 @@ void HttpCache::MetadataWriter::OnIOComplete(int result) { //----------------------------------------------------------------------------- -HttpCache::HttpCache(HostResolver* host_resolver, - CertVerifier* cert_verifier, - ServerBoundCertService* server_bound_cert_service, - TransportSecurityState* transport_security_state, - ProxyService* proxy_service, - const std::string& ssl_session_cache_shard, - SSLConfigService* ssl_config_service, - HttpAuthHandlerFactory* http_auth_handler_factory, - NetworkDelegate* network_delegate, - HttpServerProperties* http_server_properties, - NetLog* net_log, - BackendFactory* backend_factory, - const std::string& trusted_spdy_proxy) - : net_log_(net_log), +HttpCache::HttpCache(const net::HttpNetworkSession::Params& params, + BackendFactory* backend_factory) + : net_log_(params.net_log), backend_factory_(backend_factory), building_backend_(false), mode_(NORMAL), - network_layer_( - new HttpNetworkLayer( - CreateNetworkSession( - host_resolver, - cert_verifier, - server_bound_cert_service, - transport_security_state, - proxy_service, - ssl_session_cache_shard, - ssl_config_service, - http_auth_handler_factory, - network_delegate, - http_server_properties, - net_log, - trusted_spdy_proxy))) { + network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))) { } |