content/browser/media/capture/desktop_capture_device_aura_unittest.cc - Issue 663563002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/media/capture/desktop_capture_device_aura_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 unified diff | Download patch

« no previous file with comments | « content/browser/loader/resource_scheduler.cc ('k') | content/browser/media/capture/desktop_capture_device_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/browser/media/capture/desktop_capture_device_aura.h"	5 #include "content/browser/media/capture/desktop_capture_device_aura.h"

6	6

7 #include "base/synchronization/waitable_event.h"	7 #include "base/synchronization/waitable_event.h"

8 #include "content/browser/browser_thread_impl.h"	8 #include "content/browser/browser_thread_impl.h"

9 #include "content/public/browser/desktop_media_id.h"	9 #include "content/public/browser/desktop_media_id.h"

10 #include "media/video/capture/video_capture_types.h"	10 #include "media/video/capture/video_capture_types.h"

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 DesktopCaptureDeviceAura::Create(	108 DesktopCaptureDeviceAura::Create(

109 content::DesktopMediaID::RegisterAuraWindow(root_window())));	109 content::DesktopMediaID::RegisterAuraWindow(root_window())));

110	110

111 scoped_ptr<MockDeviceClient> client(new MockDeviceClient());	111 scoped_ptr<MockDeviceClient> client(new MockDeviceClient());

112 EXPECT_CALL(*client, OnError(_)).Times(0);	112 EXPECT_CALL(*client, OnError(_)).Times(0);

113	113

114 media::VideoCaptureParams capture_params;	114 media::VideoCaptureParams capture_params;

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

116 capture_params.requested_format.frame_rate = kFrameRate;	116 capture_params.requested_format.frame_rate = kFrameRate;

117 capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;	117 capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;

118 capture_device->AllocateAndStart(	118 capture_device->AllocateAndStart(capture_params, client.Pass());

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

120 capture_device->StopAndDeAllocate();	119 capture_device->StopAndDeAllocate();

121 }	120 }

122	121

123 } // namespace	122 } // namespace

124 } // namespace content	123 } // namespace content

OLD	NEW