ios/chrome/browser/net/proxy_service_factory.cc - Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

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: ios/chrome/browser/net/proxy_service_factory.cc

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mmenke initial review 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

« chrome/browser/net/proxy_service_factory.cc ('K') | « content/shell/browser/shell_url_request_context_getter.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | ios/crnet/crnet_environment.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/net/proxy_service_factory.cc

diff --git a/ios/chrome/browser/net/proxy_service_factory.cc b/ios/chrome/browser/net/proxy_service_factory.cc

index 5520bcbfe14d507a45b9006cbecd91398aebf8f9..1bccc6175532d88cd145bf15f6f386122e660723 100644

--- a/ios/chrome/browser/net/proxy_service_factory.cc

+++ b/ios/chrome/browser/net/proxy_service_factory.cc

@@ -49,8 +49,8 @@ scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(

bool quick_check_enabled) {

DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);

scoped_ptr<net::ProxyService> proxy_service(

- net::ProxyService::CreateUsingSystemProxyResolver(proxy_config_service, 0,

- net_log));

+ net::ProxyService::CreateUsingSystemProxyResolver(

+ make_scoped_ptr(proxy_config_service), 0, net_log));

proxy_service->set_quick_check_enabled(quick_check_enabled);

return proxy_service.Pass();

}