chrome/browser/net/proxy_service_factory.cc - Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs.

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: chrome/browser/net/proxy_service_factory.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab

Patch Set: Lots of fixes driven by try jobs. 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

« chrome/browser/net/proxy_service_factory.h ('K') | « chrome/browser/net/proxy_service_factory.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/proxy_service_factory.cc

diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc

index 7ec1ac30ffbabacfe337518d51228ac58ea12092..1482f0feccac8a80ef042497029b0659e151f9ee 100644

--- a/chrome/browser/net/proxy_service_factory.cc

+++ b/chrome/browser/net/proxy_service_factory.cc

@@ -110,7 +110,7 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

}

// static

-net::ProxyService* ProxyServiceFactory::CreateProxyService(

+scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(

net::NetLog* net_log,

net::URLRequestContext* context,

net::NetworkDelegate* network_delegate,

@@ -147,7 +147,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(

}

- net::ProxyService* proxy_service = NULL;

+ scoped_ptr<net::ProxyService> proxy_service;

if (use_v8) {

#if defined(OS_IOS)

NOTREACHED();