content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc - Issue 655133002: 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: content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

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

Patch Set: 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 | « content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

index e72971726017185cf1d9736f17026d8caf612f86..a0f6586327c97729750ec9f36befb1a1398c1e31 100644

--- a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

+++ b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc

@@ -133,7 +133,7 @@ TEST_F(MediaStreamUIProxyTest, AcceptAndStart) {

MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE, "Mic", "Mic"));

scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());

EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(0));

- callback.Run(devices, MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>());

+ callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass());

MediaStreamDevices response;

EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))

@@ -192,7 +192,7 @@ TEST_F(MediaStreamUIProxyTest, StopFromUI) {

scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());

EXPECT_CALL(*ui, OnStarted(_))

.WillOnce(testing::DoAll(SaveArg<0>(&stop_callback), Return(0)));

- callback.Run(devices, MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>());

+ callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass());

MediaStreamDevices response;

EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _))

@@ -237,8 +237,7 @@ TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) {

scoped_ptr<MockMediaStreamUI> ui(new MockMediaStreamUI());

EXPECT_CALL(*ui, OnStarted(_)).WillOnce(Return(kWindowId));

- callback.Run(

- MediaStreamDevices(), MEDIA_DEVICE_OK, ui.PassAs<MediaStreamUI>());

+ callback.Run(MediaStreamDevices(), MEDIA_DEVICE_OK, ui.Pass());

EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _));

MockStopStreamHandler handler;