content/browser/media/capture/desktop_capture_device_unittest.cc - Issue 663563002: 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/media/capture/desktop_capture_device_unittest.cc

Issue 663563002: 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/media/capture/desktop_capture_device_aura_unittest.cc ('k') | content/browser/media/capture/web_contents_video_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device_unittest.cc

diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc

index 40ea968c7139e8904ca9e3785b8830e69a655a4b..5c2322a14e1cef319cf9c905c5672b105b964812 100644

--- a/content/browser/media/capture/desktop_capture_device_unittest.cc

+++ b/content/browser/media/capture/desktop_capture_device_unittest.cc

@@ -175,8 +175,7 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {

capture_params.requested_format.frame_size.SetSize(640, 480);

capture_params.requested_format.frame_rate = kFrameRate;

capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;

- capture_device_->AllocateAndStart(

- capture_params, client.PassAs<media::VideoCaptureDevice::Client>());

+ capture_device_->AllocateAndStart(capture_params, client.Pass());

EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));

capture_device_->StopAndDeAllocate();

@@ -212,8 +211,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {

capture_params.requested_format.frame_rate = kFrameRate;

capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;

- capture_device_->AllocateAndStart(

- capture_params, client.PassAs<media::VideoCaptureDevice::Client>());

+ capture_device_->AllocateAndStart(capture_params, client.Pass());

// Capture at least two frames, to ensure that the source frame size has

// changed while capturing.