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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2715513008: Make FakeVideoCaptureDeviceFactory configurable to arbitrary fake device configurations (Closed)
Patch Set: emircan@ suggestions Created 3 years, 10 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 | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | media/capture/video/fake_video_capture_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 d016111e4c1218afb481cb40137ec503dcd77c32..68b86e5a8a4ba8b6dfc10c8e7ab983638d9eb802 100644
--- a/content/browser/renderer_host/media/media_devices_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_devices_manager_unittest.cc
@@ -349,7 +349,8 @@ TEST_F(MediaDevicesManagerTest, EnumerateCacheVideoWithDeviceChanges) {
// Simulate device change
size_t num_video_input_devices = 5;
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
EnableCache(MEDIA_DEVICE_TYPE_VIDEO_INPUT);
MediaDevicesManager::BoolDeviceTypes devices_to_enumerate;
devices_to_enumerate[MEDIA_DEVICE_TYPE_VIDEO_INPUT] = true;
@@ -366,7 +367,8 @@ TEST_F(MediaDevicesManagerTest, EnumerateCacheVideoWithDeviceChanges) {
// Simulate device change
num_video_input_devices = 9;
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
media_devices_manager_->OnDevicesChanged(
base::SystemMonitor::DEVTYPE_VIDEO_CAPTURE);
@@ -396,7 +398,8 @@ TEST_F(MediaDevicesManagerTest, EnumerateCacheAllWithDeviceChanges) {
size_t num_video_input_devices = 4;
size_t num_audio_output_devices = 3;
audio_manager_->SetNumAudioInputDevices(num_audio_input_devices);
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
audio_manager_->SetNumAudioOutputDevices(num_audio_output_devices);
EnableCache(MEDIA_DEVICE_TYPE_AUDIO_INPUT);
EnableCache(MEDIA_DEVICE_TYPE_AUDIO_OUTPUT);
@@ -425,7 +428,8 @@ TEST_F(MediaDevicesManagerTest, EnumerateCacheAllWithDeviceChanges) {
num_video_input_devices = 2;
num_audio_output_devices = 4;
audio_manager_->SetNumAudioInputDevices(num_audio_input_devices);
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
audio_manager_->SetNumAudioOutputDevices(num_audio_output_devices);
media_devices_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
media_devices_manager_->OnDevicesChanged(
@@ -457,7 +461,8 @@ TEST_F(MediaDevicesManagerTest, SubscribeDeviceChanges) {
size_t num_video_input_devices = 4;
size_t num_audio_output_devices = 3;
audio_manager_->SetNumAudioInputDevices(num_audio_input_devices);
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
audio_manager_->SetNumAudioOutputDevices(num_audio_output_devices);
// Run an enumeration to make sure |media_devices_manager_| has the new
@@ -529,7 +534,8 @@ TEST_F(MediaDevicesManagerTest, SubscribeDeviceChanges) {
num_video_input_devices = 2;
num_audio_output_devices = 4;
audio_manager_->SetNumAudioInputDevices(num_audio_input_devices);
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
audio_manager_->SetNumAudioOutputDevices(num_audio_output_devices);
media_devices_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
media_devices_manager_->OnDevicesChanged(
@@ -555,7 +561,8 @@ TEST_F(MediaDevicesManagerTest, SubscribeDeviceChanges) {
num_video_input_devices = 1;
num_audio_output_devices = 3;
audio_manager_->SetNumAudioInputDevices(num_audio_input_devices);
- video_capture_device_factory_->set_number_of_devices(num_video_input_devices);
+ video_capture_device_factory_->SetToDefaultDevicesConfig(
+ num_video_input_devices);
audio_manager_->SetNumAudioOutputDevices(num_audio_output_devices);
media_devices_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
media_devices_manager_->OnDevicesChanged(
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | media/capture/video/fake_video_capture_device.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698