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

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed two comments, fix some tests Created 5 years, 3 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/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 508b182d745ca856e3a7a6c18ab8f1e5a24e6699..d16da61e3b5e64e34586112be16f753a7296a75d 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -387,6 +387,9 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
network_session_params.quic_connection_options =
http_network_session_params_.quic_connection_options;
+ storage->set_http_network_session(
+ make_scoped_ptr(new HttpNetworkSession(network_session_params)));
+
HttpTransactionFactory* http_transaction_factory = NULL;
pauljensen 2015/09/11 13:05:25 nit: remove the " = NULL" like you did in profile_
mmenke 2015/09/11 14:46:50 Done.
if (http_cache_enabled_) {
HttpCache::BackendFactory* http_cache_backend = NULL;
@@ -399,13 +402,11 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
HttpCache::DefaultBackend::InMemory(http_cache_params_.max_size);
}
- http_transaction_factory = new HttpCache(
- network_session_params, http_cache_backend);
+ http_transaction_factory = new HttpCache(storage->http_network_session(),
+ http_cache_backend, true);
} else {
- scoped_refptr<HttpNetworkSession> network_session(
- new HttpNetworkSession(network_session_params));
-
- http_transaction_factory = new HttpNetworkLayer(network_session.get());
+ http_transaction_factory =
+ new HttpNetworkLayer(storage->http_network_session());
}
storage->set_http_transaction_factory(http_transaction_factory);

Powered by Google App Engine
This is Rietveld 408576698