content/browser/resolve_proxy_msg_helper_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: content/browser/resolve_proxy_msg_helper_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: 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

« no previous file with comments | « components/cronet/android/url_request_context_adapter.cc ('k') | content/shell/browser/shell_url_request_context_getter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/resolve_proxy_msg_helper_unittest.cc

diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc

index 9dab2939cdf45879dd306276064e3e19bee810cd..5e3dd0de58435ff2f1cef8468d99216182951034 100644

--- a/content/browser/resolve_proxy_msg_helper_unittest.cc

+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc

@@ -59,9 +59,10 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {

ResolveProxyMsgHelperTest()

: resolver_factory_(new net::MockAsyncProxyResolverFactory(false)),

- service_(new net::ProxyService(new MockProxyConfigService,

- make_scoped_ptr(resolver_factory_),

- NULL)),

+ service_(

+ new net::ProxyService(make_scoped_ptr(new MockProxyConfigService),

+ make_scoped_ptr(resolver_factory_),

+ NULL)),

helper_(new TestResolveProxyMsgHelper(service_.get(), this)),

io_thread_(BrowserThread::IO, &message_loop_) {

test_sink_.AddFilter(this);