content/browser/renderer_host/media/media_devices_manager_unittest.cc - Issue 2805533002: Reland [Mojo Video Capture] Introduce abstraction VideoCaptureSystem

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_devices_manager_unittest.cc

Issue 2805533002: Reland [Mojo Video Capture] Introduce abstraction VideoCaptureSystem (Closed)

Patch Set: Fix race condition in tests Created 3 years, 8 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

« content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc ('K') | « content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5ad37f96ca9133dc78c4b1ea030cf2236e00d315..cc3356de04dc3c6fe2fd3b484a9e970055f5ede3 100644

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

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

@@ -143,8 +143,9 @@ class MediaDevicesManagerTest : public ::testing::Test {

audio_manager_.reset(new MockAudioManager());

audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());

video_capture_manager_ = new VideoCaptureManager(

- std::unique_ptr<media::VideoCaptureDeviceFactory>(

- new MockVideoCaptureDeviceFactory()),

+ base::MakeUnique<media::VideoCaptureSystem>(

+ std::unique_ptr<media::VideoCaptureDeviceFactory>(

+ new MockVideoCaptureDeviceFactory())),

base::ThreadTaskRunnerHandle::Get());

video_capture_device_factory_ = static_cast<MockVideoCaptureDeviceFactory*>(

video_capture_manager_->video_capture_device_factory());