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

Unified Diff: chrome/browser/io_thread.cc

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed too much, back up a bit Created 5 years, 4 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: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 056d9f07c0b1a1530a7dc37ef4029f49e438e9c8..00a4122459ae7da194ee3f4a63c9ae2998ce35fc 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -70,6 +70,7 @@
#include "net/http/http_auth_filter.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_network_layer.h"
+#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_script_fetcher_impl.h"
@@ -1493,8 +1494,10 @@ net::URLRequestContext* IOThread::ConstructSystemRequestContext(
net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
context, &system_params);
+ globals->system_http_network_session.reset(
+ new net::HttpNetworkSession(system_params));
globals->system_http_transaction_factory.reset(
- new net::HttpNetworkLayer(new net::HttpNetworkSession(system_params)));
+ new net::HttpNetworkLayer(globals->system_http_network_session.get()));
context->set_http_transaction_factory(
globals->system_http_transaction_factory.get());
@@ -1544,15 +1547,16 @@ net::URLRequestContext* IOThread::ConstructProxyScriptFetcherContext(
tracked_objects::ScopedTracker tracking_profile2(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466432 IOThread::ConstructProxyScriptFetcherContext2"));
- scoped_refptr<net::HttpNetworkSession> network_session(
+ globals->proxy_script_fetcher_http_network_session.reset(
new net::HttpNetworkSession(session_params));
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
// is fixed.
tracked_objects::ScopedTracker tracking_profile3(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"466432 IOThread::ConstructProxyScriptFetcherContext3"));
- globals->proxy_script_fetcher_http_transaction_factory
- .reset(new net::HttpNetworkLayer(network_session.get()));
+ globals->proxy_script_fetcher_http_transaction_factory.reset(
+ new net::HttpNetworkLayer(
+ globals->proxy_script_fetcher_http_network_session.get()));
context->set_http_transaction_factory(
globals->proxy_script_fetcher_http_transaction_factory.get());

Powered by Google App Engine
This is Rietveld 408576698