chrome/browser/profiles/profile_io_data.cc - Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_io_data.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

« no previous file with comments | « chrome/browser/net/proxy_service_factory.cc ('k') | chrome/service/net/service_url_request_context_getter.cc » ('j') | content/shell/browser/shell_url_request_context_getter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_io_data.cc

diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc

index a8f67ea8144871156e3bc8bcb7dd2687be1ab299..217abc8f5d83ae436a6585d9b9406b5295267d3d 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -1057,14 +1057,12 @@ void ProfileIOData::Init(

// NOTE: Proxy service uses the default io thread network delegate, not the

// delegate just created.

- proxy_service_.reset(

- ProxyServiceFactory::CreateProxyService(

- io_thread->net_log(),

- io_thread_globals->proxy_script_fetcher_context.get(),

- io_thread_globals->system_network_delegate.get(),

- profile_params_->proxy_config_service.release(),

- command_line,

- quick_check_enabled_.GetValue()));

+ proxy_service_.reset(ProxyServiceFactory::CreateProxyService(

+ io_thread->net_log(),

+ io_thread_globals->proxy_script_fetcher_context.get(),

+ io_thread_globals->system_network_delegate.get(),

+ profile_params_->proxy_config_service.Pass(), command_line,

+ quick_check_enabled_.GetValue()));

transport_security_state_.reset(new net::TransportSecurityState());

base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();

transport_security_persister_.reset(