net/proxy/proxy_service_mojo.h - 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: net/proxy/proxy_service_mojo.h

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

Index: net/proxy/proxy_service_mojo.h

diff --git a/net/proxy/proxy_service_mojo.h b/net/proxy/proxy_service_mojo.h

index d6927cae961df7c279fa64e984aa67966acea9bf..3921bb8c531ca64e2e5e0fb93af57da73f8977d1 100644

--- a/net/proxy/proxy_service_mojo.h

+++ b/net/proxy/proxy_service_mojo.h

@@ -39,7 +39,7 @@ class ProxyService;

// lifetime of the ProxyService.

scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(

MojoProxyResolverFactory* mojo_proxy_factory,

- ProxyConfigService* proxy_config_service,

+ scoped_ptr<ProxyConfigService> proxy_config_service,

ProxyScriptFetcher* proxy_script_fetcher,

DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,

HostResolver* host_resolver,

@@ -55,7 +55,7 @@ scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(

// # other V8's running in the process must use v8::Locker.

// ##########################################################################

scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess(

- ProxyConfigService* proxy_config_service,

+ scoped_ptr<ProxyConfigService> proxy_config_service,

ProxyScriptFetcher* proxy_script_fetcher,

DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,

HostResolver* host_resolver,

« no previous file with comments | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »