components/cronet/android/url_request_context_adapter.cc - Issue 1303493002: Make UrlRequestContextBuilder take scoped_ptr's

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 1303493002: Make UrlRequestContextBuilder take scoped_ptr's (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sync and fix tiny resulting build failure 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:

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 b04bece6bbd5504d00f6191b2077cabca730cc88..29a9456fc23383d8d0a8637c2ffc97feb3836978 100644

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

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

@@ -139,11 +139,12 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {

DCHECK(config_);

// TODO(mmenke): Add method to have the builder enable SPDY.

net::URLRequestContextBuilder context_builder;

- context_builder.set_network_delegate(new BasicNetworkDelegate());

- context_builder.set_proxy_config_service(proxy_config_service_.get());

+ context_builder.set_network_delegate(

+ make_scoped_ptr(new BasicNetworkDelegate()));

+ context_builder.set_proxy_config_service(proxy_config_service_.Pass());

config_->ConfigureURLRequestContextBuilder(&context_builder);

- context_.reset(context_builder.Build());

+ context_ = context_builder.Build().Pass();

if (config_->enable_sdch) {

DCHECK(context_->sdch_manager());