Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

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
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());

Powered by Google App Engine
This is Rietveld 408576698