chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc - Issue 640353003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

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/local_discovery/privetv3_setup_flow_unittest.cc

Issue 640353003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix typo Created 6 years, 2 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 | « chrome/browser/local_discovery/privet_http_unittest.cc ('k') | chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc

diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc

index d25f982c883adef84ae2d0a765392941b49137f6..5cf3e28ae2864b9b3300beeddd1110fef4e824d7 100644

--- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc

+++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc

@@ -92,7 +92,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {

const PrivetClientCallback& callback) override {

scoped_ptr<MockPrivetHTTPClient> privet_client(new MockPrivetHTTPClient());

privet_client_ptr_ = privet_client.get();

- callback.Run(privet_client.PassAs<PrivetHTTPClient>());

+ callback.Run(privet_client.Pass());

}

MOCK_METHOD2(ConfirmSecurityCode,

void(const std::string&, const ResultCallback&));

@@ -101,8 +101,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {

MOCK_METHOD0(OnSetupError, void());

virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override {

- scoped_ptr<MockGCDApiFlow> mock_gcd(new MockGCDApiFlow(this));

- return mock_gcd.PassAs<GCDApiFlow>();

+ return make_scoped_ptr(new MockGCDApiFlow(this));

}

void ReplyWithToken() {