ios/crnet/crnet_environment.mm - 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: ios/crnet/crnet_environment.mm

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

« content/shell/browser/shell_url_request_context_getter.cc ('K') | « content/shell/browser/shell_url_request_context_getter.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | net/proxy/proxy_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/crnet/crnet_environment.mm

diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm

index ffeda97c3f2c496002065ac9a6686bc2f62d5b00..e2efbd46e62719cd735b19e8afd4e1d120fce4f3 100644

--- a/ios/crnet/crnet_environment.mm

+++ b/ios/crnet/crnet_environment.mm

@@ -282,8 +282,8 @@ void CrNetEnvironment::Install() {

// The network change notifier must be initialized so that registered

// delegates will receive callbacks.

network_change_notifier_.reset(net::NetworkChangeNotifier::Create());

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

- network_io_thread_->task_runner(), nullptr));

+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(

+ network_io_thread_->task_runner(), nullptr);

PostToNetworkThread(FROM_HERE,

base::Bind(&CrNetEnvironment::InitializeOnNetworkThread,

@@ -402,7 +402,7 @@ void CrNetEnvironment::InitializeOnNetworkThread() {

main_context_->host_resolver()));

main_context_->set_proxy_service(

net::ProxyService::CreateUsingSystemProxyResolver(

- proxy_config_service_.get(), 0, nullptr));

+ proxy_config_service_.Pass(), 0, nullptr));

// Cache

NSArray* dirs = NSSearchPathForDirectoriesInDomains(NSCachesDirectory,