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

Unified Diff: chrome/browser/io_thread.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Sync'd to revision p347709. 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: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 056d9f07c0b1a1530a7dc37ef4029f49e438e9c8..4ac56d4e61420aed17470fae7c2097796e1aeec0 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -681,8 +681,8 @@ void IOThread::Init() {
globals_->host_resolver.get()));
globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl());
// For the ProxyScriptFetcher, we use a direct ProxyService.
- globals_->proxy_script_fetcher_proxy_service.reset(
- net::ProxyService::CreateDirectWithNetLog(net_log_));
+ globals_->proxy_script_fetcher_proxy_service =
+ net::ProxyService::CreateDirectWithNetLog(net_log_);
// In-memory cookie store.
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
// is fixed.
@@ -1090,14 +1090,11 @@ void IOThread::InitSystemRequestContextOnIOThread() {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
- globals_->system_proxy_service.reset(
- ProxyServiceFactory::CreateProxyService(
- net_log_,
- globals_->proxy_script_fetcher_context.get(),
- globals_->system_network_delegate.get(),
- system_proxy_config_service_.release(),
- command_line,
- quick_check_enabled_.GetValue()));
+ globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService(
+ net_log_, globals_->proxy_script_fetcher_context.get(),
+ globals_->system_network_delegate.get(),
+ system_proxy_config_service_.release(), command_line,
+ quick_check_enabled_.GetValue());
globals_->system_request_context.reset(
ConstructSystemRequestContext(globals_, net_log_));

Powered by Google App Engine
This is Rietveld 408576698