Chromium Code Reviews| Index: net/http/http_cache.cc |
| diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc |
| index 8c7dc1e6fbf312c99d17e8d431990fd6af224344..06e42227de60474aa2da7b0bfaf32ed880f4a0f7 100644 |
| --- a/net/http/http_cache.cc |
| +++ b/net/http/http_cache.cc |
| @@ -291,12 +291,8 @@ HttpCache::HttpCache(const net::HttpNetworkSession::Params& params, |
| backend_factory_(backend_factory), |
| building_backend_(false), |
| mode_(NORMAL), |
| - quic_server_info_factory_(params.enable_quic_persist_server_info ? |
| - new QuicServerInfoFactoryAdaptor(this) : NULL), |
| 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()); |
| + SetupNetworkSession(network_layer_->GetSession()); |
| } |
| @@ -313,12 +309,15 @@ HttpCache::HttpCache(HttpNetworkSession* session, |
| HttpCache::HttpCache(HttpTransactionFactory* network_layer, |
| NetLog* net_log, |
| - BackendFactory* backend_factory) |
| + BackendFactory* backend_factory, |
| + bool setup_network_session) |
| : net_log_(net_log), |
| backend_factory_(backend_factory), |
| building_backend_(false), |
| mode_(NORMAL), |
| network_layer_(network_layer) { |
| + if (setup_network_session) |
| + SetupNetworkSession(network_layer_->GetSession()); |
| } |
| HttpCache::~HttpCache() { |
| @@ -1000,6 +999,15 @@ bool HttpCache::RemovePendingTransactionFromPendingOp(PendingOp* pending_op, |
| return false; |
| } |
| +void HttpCache::SetupNetworkSession(HttpNetworkSession* session) { |
| + if (session->params().enable_quic_persist_server_info) { |
|
rvargas (doing something else)
2014/04/29 23:40:45
couldn't we use this condition to avoid having an
eustas
2014/05/07 13:47:17
Unfortunately, this condition doesn't (and shouldn
|
| + DCHECK(!quic_server_info_factory_.get()); |
|
rvargas (doing something else)
2014/04/29 23:40:45
nit: shouldn't need get() here
eustas
2014/05/07 13:47:17
Done.
|
| + quic_server_info_factory_.reset(new QuicServerInfoFactoryAdaptor(this)); |
| + session->quic_stream_factory()->set_quic_server_info_factory( |
| + quic_server_info_factory_.get()); |
| + } |
| +} |
| + |
| void HttpCache::ProcessPendingQueue(ActiveEntry* entry) { |
| // Multiple readers may finish with an entry at once, so we want to batch up |
| // calls to OnProcessPendingQueue. This flag also tells us that we should |