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

Unified Diff: content/browser/renderer_host/media/media_stream_manager_unittest.cc

Issue 235353002: Extract VideoCaptureDeviceFactory out of VideoCaptureDevice and use for File and FakeVCD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: perkj@s comments Created 6 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_stream_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
index be4d498f87d81fd3922bddc2120b2a110125acc9..643764314688208da8665aeaaa74d9085995ff86 100644
--- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
@@ -14,6 +14,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/fake_audio_log_factory.h"
+#include "media/video/capture/fake_video_capture_device_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -80,8 +81,11 @@ class MediaStreamManagerTest : public ::testing::Test {
media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
// Use fake devices in order to run on the bots.
- media_stream_manager_->UseFakeDevice();
- }
+ media_stream_manager_->UseFakeVideoDevice(
+ scoped_ptr<media::VideoCaptureDeviceFactory>(
+ new media::FakeVideoCaptureDeviceFactory()));
+ media_stream_manager_->UseFakeAudioDevice();
+}
virtual ~MediaStreamManagerTest() {
}

Powered by Google App Engine
This is Rietveld 408576698