net/proxy/proxy_service_mojo_unittest.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_mojo_unittest.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

Index: net/proxy/proxy_service_mojo_unittest.cc

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

index 171f89be8c42f10555272e153014c0d7001d0b38..4f27a8f84afd8c54c6ca43f6c314dedbfb9a5fcf 100644

--- a/net/proxy/proxy_service_mojo_unittest.cc

+++ b/net/proxy/proxy_service_mojo_unittest.cc

@@ -126,9 +126,9 @@ class ProxyServiceMojoTest : public testing::Test,

mock_host_resolver_.rules()->AddRule("example.com", "1.2.3.4");

fetcher_ = new MockProxyScriptFetcher;

- proxy_service_.reset(CreateProxyServiceUsingMojoFactory(

- this, new ProxyConfigServiceFixed(

- ProxyConfig::CreateFromCustomPacURL(GURL(kPacUrl))),

+ proxy_service_ = make_scoped_ptr(CreateProxyServiceUsingMojoFactory(

Randy Smith (Not in Mondays) 2015/08/24 21:58:19 Why not just leave it as .reset() if it's getting

+ this, make_scoped_ptr(new ProxyConfigServiceFixed(

+ ProxyConfig::CreateFromCustomPacURL(GURL(kPacUrl)))),

fetcher_, new DoNothingDhcpProxyScriptFetcher(), &mock_host_resolver_,

&net_log_, &network_delegate_));

}

« net/proxy/proxy_service.cc ('K') | « net/proxy/proxy_service_mojo.cc ('k') | net/proxy/proxy_service_unittest.cc » ('j') | net/url_request/url_request_context_builder.cc » ('J')