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

Unified Diff: chrome/browser/io_thread.cc

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: proper namespacing 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 a3558f737567547f83abbde9944a525a835883e3..ac24cd6912b3a713943af2960c79113cd1874e16 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1070,9 +1070,8 @@ void IOThread::InitSystemRequestContext() {
// If we're in unit_tests, IOThread may not be run.
if (!BrowserThread::IsMessageLoopValid(BrowserThread::IO))
return;
- system_proxy_config_service_.reset(
- ProxyServiceFactory::CreateProxyConfigService(
- pref_proxy_config_tracker_.get()));
+ system_proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
+ pref_proxy_config_tracker_.get());
system_url_request_context_getter_ =
new SystemURLRequestContextGetter(this);
// Safe to post an unretained this pointer, since IOThread is
@@ -1094,7 +1093,7 @@ void IOThread::InitSystemRequestContextOnIOThread() {
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,
+ system_proxy_config_service_.Pass(), command_line,
quick_check_enabled_.GetValue());
globals_->system_request_context.reset(
« no previous file with comments | « android_webview/browser/net/aw_url_request_context_getter.cc ('k') | chrome/browser/net/proxy_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698