diff options
Diffstat (limited to 'chromium/content/browser/media/media_internals_unittest.cc')
-rw-r--r-- | chromium/content/browser/media/media_internals_unittest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/content/browser/media/media_internals_unittest.cc b/chromium/content/browser/media/media_internals_unittest.cc index 2947104cad3..b9208c8dfd1 100644 --- a/chromium/content/browser/media/media_internals_unittest.cc +++ b/chromium/content/browser/media/media_internals_unittest.cc @@ -16,8 +16,7 @@ namespace { const int kTestComponentID = 0; -const char kTestInputDeviceID[] = "test-input-id"; -const char kTestOutputDeviceID[] = "test-output-id"; +const char kTestDeviceID[] = "test-device-id"; } // namespace namespace content { @@ -31,9 +30,12 @@ class MediaInternalsTest base::Unretained(this))), test_params_(media::AudioParameters::AUDIO_PCM_LINEAR, media::CHANNEL_LAYOUT_MONO, + 0, 48000, 16, - 128), + 128, + media::AudioParameters::ECHO_CANCELLER | + media::AudioParameters::DUCKING), test_component_(GetParam()), audio_log_(media_internals_->CreateAudioLog(test_component_)) { media_internals_->AddUpdateCallback(update_cb_); @@ -87,7 +89,7 @@ class MediaInternalsTest TEST_P(MediaInternalsTest, AudioLogCreateStartStopErrorClose) { audio_log_->OnCreated( - kTestComponentID, test_params_, kTestInputDeviceID, kTestOutputDeviceID); + kTestComponentID, test_params_, kTestDeviceID); base::RunLoop().RunUntilIdle(); ExpectString("channel_layout", @@ -96,8 +98,8 @@ TEST_P(MediaInternalsTest, AudioLogCreateStartStopErrorClose) { ExpectInt("frames_per_buffer", test_params_.frames_per_buffer()); ExpectInt("channels", test_params_.channels()); ExpectInt("input_channels", test_params_.input_channels()); - ExpectString("output_device_id", kTestOutputDeviceID); - ExpectString("input_device_id", kTestInputDeviceID); + ExpectString("effects", "ECHO_CANCELLER | DUCKING"); + ExpectString("device_id", kTestDeviceID); ExpectInt("component_id", kTestComponentID); ExpectInt("component_type", test_component_); ExpectStatus("created"); @@ -128,7 +130,7 @@ TEST_P(MediaInternalsTest, AudioLogCreateStartStopErrorClose) { TEST_P(MediaInternalsTest, AudioLogCreateClose) { audio_log_->OnCreated( - kTestComponentID, test_params_, kTestInputDeviceID, kTestOutputDeviceID); + kTestComponentID, test_params_, kTestDeviceID); base::RunLoop().RunUntilIdle(); ExpectStatus("created"); |