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

Unified Diff: chrome/browser/io_thread.cc

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: non linux builds 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 575223179e74d406ed0a5c3f1890475fe78fe1da..5765b95b1d1f9fa7f93457865286700c22e1f15e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1221,14 +1221,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.reset(ProxyServiceFactory::CreateProxyService(
+ net_log_, globals_->proxy_script_fetcher_context.get(),
+ globals_->system_network_delegate.get(),
+ system_proxy_config_service_.Pass(), command_line,
+ quick_check_enabled_.GetValue()));
net::HttpNetworkSession::Params system_params;
InitializeNetworkSessionParams(&system_params);
« no previous file with comments | « no previous file | chrome/browser/net/proxy_service_factory.h » ('j') | content/shell/browser/shell_url_request_context_getter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698