chrome/service/net/service_url_request_context_getter.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/service/net/service_url_request_context_getter.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: try merging again... 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/service/net/service_url_request_context_getter.cc

diff --git a/chrome/service/net/service_url_request_context_getter.cc b/chrome/service/net/service_url_request_context_getter.cc

index 456466e8a10cd0b2ef2e629352798be7c4b582a0..2e444334d46704cde795fa8c3b649954fd101f78 100644

--- a/chrome/service/net/service_url_request_context_getter.cc

+++ b/chrome/service/net/service_url_request_context_getter.cc

@@ -97,9 +97,9 @@ ServiceURLRequestContextGetter::ServiceURLRequestContextGetter()

: user_agent_(MakeUserAgentForServiceProcess()),

network_task_runner_(g_service_process->io_task_runner()) {

DCHECK(g_service_process);

- proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(

+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(

g_service_process->io_task_runner(),

- g_service_process->file_task_runner()));

+ g_service_process->file_task_runner());

}

net::URLRequestContext*

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chromecast/browser/url_request_context_factory.cc » ('j') | no next file with comments »