From 345c13e75c87b5693c0238d48b6c22e70ad5d25d Mon Sep 17 00:00:00 2001 From: "dbeam@chromium.org" Date: Tue, 11 Dec 2012 20:57:03 +0000 Subject: 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 --- media/audio/audio_input_unittest.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'media/audio/audio_input_unittest.cc') 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 audio_man(AudioManager::Create()); if (!CanRunAudioTests(audio_man.get())) return; -- cgit v1.1