diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 19:16:31 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 19:16:31 +0000 |
| commit | 0a35579ba0fbbd84ad1f2062e9d49d8106b0ef86 (patch) | |
| tree | 6bd8431fa5a0fc1e405d3601db5e8fe80e13e8c6 /media/audio/mock_audio_manager.cc | |
| parent | 4c965c3f5b22af171ce0ade8199d9c37090a96a2 (diff) | |
| download | chromium_src-0a35579ba0fbbd84ad1f2062e9d49d8106b0ef86.zip chromium_src-0a35579ba0fbbd84ad1f2062e9d49d8106b0ef86.tar.gz chromium_src-0a35579ba0fbbd84ad1f2062e9d49d8106b0ef86.tar.bz2 | |
Revert 269354 "Added automatic mode to FakeInputAudioStream to g..."
This CL caused the MediaAccessAPIDeny_TestDenyWithPreventDefault to fail on the mac builders.
The same test also failed in the mac chromium rel browser tests try runs. Sadly they showed up
as green.
Please fix and reland
> Added automatic mode to FakeInputAudioStream to generate automatic beeps.
>
> This patch is to allow writing audio only tests using the fake input stream, also it changes the name of the fake device from "Default" to "Fake Audio, which I hope it will make things less confusing.
>
> TBR=dalecurtis@chromium.org
> NOTRY=true
>
> BUG=358541
> TEST=bots existing webrtc tests.
>
> Review URL: https://codereview.chromium.org/272723006
TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/273163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mock_audio_manager.cc')
| -rw-r--r-- | media/audio/mock_audio_manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc index 7183405..e774b8c 100644 --- a/media/audio/mock_audio_manager.cc +++ b/media/audio/mock_audio_manager.cc @@ -34,8 +34,11 @@ void MockAudioManager::ShowAudioInputSettings() { void MockAudioManager::GetAudioInputDeviceNames( AudioDeviceNames* device_names) { - // Do not inject fake devices here, use - // AudioInputDeviceManager::GetFakeDeviceNames() instead. + DCHECK(device_names->empty()); + device_names->push_back(media::AudioDeviceName("fake_device_name_1", + "fake_device_id_1")); + device_names->push_back(media::AudioDeviceName("fake_device_name_2", + "fake_device_id_2")); } void MockAudioManager::GetAudioOutputDeviceNames( |