chromecast/browser/url_request_context_factory.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: chromecast/browser/url_request_context_factory.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

« no previous file with comments | « chrome/service/net/service_url_request_context_getter.cc ('k') | components/cronet/android/cronet_url_request_context_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/browser/url_request_context_factory.cc

diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc

index 772920507db6a628de407309803446c2bdad712b..e60c451ea088fa132b23e03c45c11cc704b39f80 100644

--- a/chromecast/browser/url_request_context_factory.cc

+++ b/chromecast/browser/url_request_context_factory.cc

@@ -152,11 +152,11 @@ void URLRequestContextFactory::InitializeOnUIThread(net::NetLog* net_log) {

// Proxy config service should be initialized in UI thread, since

// ProxyConfigServiceDelegate on Android expects UI thread.

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

+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(

content::BrowserThread::GetMessageLoopProxyForThread(

content::BrowserThread::IO),

content::BrowserThread::GetMessageLoopProxyForThread(

- content::BrowserThread::FILE)));

+ content::BrowserThread::FILE));

net_log_ = net_log;

}