components/cronet/android/url_request_context_adapter.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: components/cronet/android/url_request_context_adapter.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 | « components/cronet/android/cronet_url_request_context_adapter.cc ('k') | content/browser/resolve_proxy_msg_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/url_request_context_adapter.cc

diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc

index 29a9456fc23383d8d0a8637c2ffc97feb3836978..58abcb027b31d7804fa7027991083da257ab129b 100644

--- a/components/cronet/android/url_request_context_adapter.cc

+++ b/components/cronet/android/url_request_context_adapter.cc

@@ -126,8 +126,8 @@ void URLRequestContextAdapter::Initialize(

}

void URLRequestContextAdapter::InitRequestContextOnMainThread() {

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

- GetNetworkTaskRunner(), NULL));

+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(

+ GetNetworkTaskRunner(), NULL);

GetNetworkTaskRunner()->PostTask(

FROM_HERE,

base::Bind(&URLRequestContextAdapter::InitRequestContextOnNetworkThread,