net/proxy/proxy_service_v8.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: net/proxy/proxy_service_v8.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: non linux builds 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

« net/proxy/proxy_service_mojo_unittest.cc ('K') | « net/proxy/proxy_service_v8.h ('k') | net/url_request/url_request_context_builder.cc » ('j') | net/url_request/url_request_context_builder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/proxy/proxy_service_v8.cc

diff --git a/net/proxy/proxy_service_v8.cc b/net/proxy/proxy_service_v8.cc

index 46a6605b1dcd64d714e7732175facba05a87c52b..4652c609044875f39c721cccf3a88bb1379438ec 100644

--- a/net/proxy/proxy_service_v8.cc

+++ b/net/proxy/proxy_service_v8.cc

@@ -5,6 +5,7 @@

#include "net/proxy/proxy_service_v8.h"

#include "base/logging.h"

+#include "base/memory/scoped_ptr.h"

#include "base/thread_task_runner_handle.h"

#include "base/threading/thread_checker.h"

#include "net/proxy/network_delegate_error_observer.h"

@@ -17,7 +18,7 @@ namespace net {

// static

ProxyService* CreateProxyServiceUsingV8ProxyResolver(

- ProxyConfigService* proxy_config_service,

+ scoped_ptr<ProxyConfigService> proxy_config_service,

ProxyScriptFetcher* proxy_script_fetcher,

DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,

HostResolver* host_resolver,

@@ -29,7 +30,7 @@ ProxyService* CreateProxyServiceUsingV8ProxyResolver(

DCHECK(host_resolver);

ProxyService* proxy_service = new ProxyService(

- proxy_config_service,

+ proxy_config_service.Pass(),

make_scoped_ptr(new ProxyResolverFactoryV8TracingWrapper(

host_resolver, net_log,

base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate,