Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: net/http/http_cache.cc

Issue 182993003: Add the ability for DevTools to wrap network transactions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added optional QUIC setup in HttpCache constructor Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http/http_cache.cc
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index c040aa9a36fc73ffc65aa05c7bbf322d9e19e6c3..7b210ed22afebe002694a27816c63f2edd9db7b9 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) {
+ DCHECK(!quic_server_info_factory_.get());
+ 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

Powered by Google App Engine
This is Rietveld 408576698