diff options
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_cache.cc | 6 | ||||
| -rw-r--r-- | net/http/http_network_session.cc | 2 | ||||
| -rw-r--r-- | net/http/http_network_session.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index f04df6d..ac9dda5 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -292,16 +292,20 @@ HttpCache::HttpCache(const net::HttpNetworkSession::Params& params, mode_(NORMAL), quic_server_info_factory_(new QuicServerInfoFactoryAdaptor(this)), network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))) { + HttpNetworkSession* session = network_layer_->GetSession(); + session->quic_stream_factory()->set_quic_server_info_factory( + quic_server_info_factory_.get()); } +// This call doesn't change the shared |session|'s QuicServerInfoFactory because +// |session| is shared. HttpCache::HttpCache(HttpNetworkSession* session, BackendFactory* backend_factory) : net_log_(session->net_log()), backend_factory_(backend_factory), building_backend_(false), mode_(NORMAL), - quic_server_info_factory_(new QuicServerInfoFactoryAdaptor(this)), network_layer_(new HttpNetworkLayer(session)) { } diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index e0650e6..75d3e18 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -61,7 +61,6 @@ HttpNetworkSession::Params::Params() transport_security_state(NULL), cert_transparency_verifier(NULL), proxy_service(NULL), - quic_server_info_factory(NULL), ssl_config_service(NULL), http_auth_handler_factory(NULL), network_delegate(NULL), @@ -114,7 +113,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) params.client_socket_factory : net::ClientSocketFactory::GetDefaultFactory(), params.http_server_properties, - params.quic_server_info_factory, params.quic_crypto_client_stream_factory, params.quic_random ? params.quic_random : QuicRandom::GetInstance(), diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index b49e308..9be0e91 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -65,7 +65,6 @@ class NET_EXPORT HttpNetworkSession TransportSecurityState* transport_security_state; CTVerifier* cert_transparency_verifier; ProxyService* proxy_service; - QuicServerInfoFactory* quic_server_info_factory; std::string ssl_session_cache_shard; SSLConfigService* ssl_config_service; HttpAuthHandlerFactory* http_auth_handler_factory; |