components/cronet/android/cronet_url_request_context_adapter.h - 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/cronet_url_request_context_adapter.h

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/cronet_url_request_context_adapter.h

diff --git a/components/cronet/android/cronet_url_request_context_adapter.h b/components/cronet/android/cronet_url_request_context_adapter.h

index ddfa1bac77a3320c05bb9d34d0b5bc5849c429c7..3d83f013480659658857edb21599608cc6500648 100644

--- a/components/cronet/android/cronet_url_request_context_adapter.h

+++ b/components/cronet/android/cronet_url_request_context_adapter.h

@@ -26,6 +26,7 @@ class SingleThreadTaskRunner;

namespace net {

class HttpServerPropertiesManager;

+class NetLog;

class ProxyConfigService;

class SdchOwner;

class URLRequestContext;

@@ -111,6 +112,7 @@ class CronetURLRequestContextAdapter {

// |pref_service_| should outlive the HttpServerPropertiesManager owned by

// |context_|.

scoped_ptr<PrefService> pref_service_;

+ scoped_ptr<net::NetLog> net_log_;

scoped_ptr<net::URLRequestContext> context_;

scoped_ptr<net::ProxyConfigService> proxy_config_service_;

scoped_refptr<JsonPrefStore> json_pref_store_;