diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 20:57:03 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 20:57:03 +0000 |
| commit | 345c13e75c87b5693c0238d48b6c22e70ad5d25d (patch) | |
| tree | 7dba225583e132ee048dc6f418a4433c997df9dc /media/audio/audio_input_unittest.cc | |
| parent | 07fb7cc3ec0005f4480c0bf9d203c1612d1d732c (diff) | |
| download | chromium_src-345c13e75c87b5693c0238d48b6c22e70ad5d25d.zip chromium_src-345c13e75c87b5693c0238d48b6c22e70ad5d25d.tar.gz chromium_src-345c13e75c87b5693c0238d48b6c22e70ad5d25d.tar.bz2 | |
Revert 172385
Broke content_unittests on Linux (aura) and Linux (clang)
> Let ALSA enumerate audio devices rather than iterating over physical devices.
>
> Some configurations (e.g. Chromoting virtual desktops) have no audio hardware,
> but still provide valid ALSA output devices that Chrome can use.
>
> BUG=162953,165401
>
>
> Review URL: https://chromiumcodereview.appspot.com/11299222
TBR=wez@chromium.org
Review URL: https://codereview.chromium.org/11528021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_input_unittest.cc')
| -rw-r--r-- | media/audio/audio_input_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 380312f..5a02323b 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -137,13 +137,7 @@ TEST(AudioInputTest, OpenStopAndClose) { } // Test a normal recording sequence using an AudioInputStream. -// This test currently fails on the Linux bots (crbug.com/165401). -#if defined(OS_LINUX) -#define MAYBE_Record DISABLED_Record -#else -#define MAYBE_Record Record -#endif // defined(OS_LINUX) -TEST(AudioInputTest, MAYBE_Record) { +TEST(AudioInputTest, Record) { scoped_ptr<AudioManager> audio_man(AudioManager::Create()); if (!CanRunAudioTests(audio_man.get())) return; |