Index: media/audio/audio_manager_unittest.cc |
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc |
index 5063d073167c62438bd91834ac827a3655e5201f..0819af751114ea01f46439a3fa43fb688a946f7b 100644 |
--- a/media/audio/audio_manager_unittest.cc |
+++ b/media/audio/audio_manager_unittest.cc |
@@ -7,21 +7,19 @@ |
#include "media/audio/audio_manager.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#if defined(OS_LINUX) |
+#include "media/audio/linux/audio_manager_linux.h" |
+#endif // defined(OS_LINUX) |
+ |
#if defined(USE_PULSEAUDIO) |
#include "media/audio/pulse/audio_manager_pulse.h" |
-#endif |
+#endif // defined(USE_PULSEAUDIO) |
namespace media { |
-// TODO(joi): Remove guards once implemented for all platforms. |
-TEST(AudioManagerTest, GetAudioOutputDeviceNames) { |
-#if defined(USE_PULSEAUDIO) |
- scoped_ptr<AudioManager> audio_manager_pulse(AudioManagerPulse::Create()); |
- if (!audio_manager_pulse) |
- return; |
- |
+void GetAudioOutputDeviceNamesImpl(AudioManager* audio_manager) { |
AudioDeviceNames device_names; |
- audio_manager_pulse->GetAudioOutputDeviceNames(&device_names); |
+ audio_manager->GetAudioOutputDeviceNames(&device_names); |
VLOG(2) << "Got " << device_names.size() << " audio output devices."; |
for (AudioDeviceNames::iterator it = device_names.begin(); |
@@ -31,7 +29,26 @@ TEST(AudioManagerTest, GetAudioOutputDeviceNames) { |
EXPECT_FALSE(it->device_name.empty()); |
VLOG(2) << "Device ID(" << it->unique_id << "), label: " << it->device_name; |
} |
+} |
+ |
+TEST(AudioManagerTest, GetAudioOutputDeviceNames) { |
+#if defined(USE_PULSEAUDIO) |
+ { |
+ VLOG(2) << "Testing AudioManagerPulse."; |
+ scoped_ptr<AudioManager> pulse_audio_manager(AudioManagerPulse::Create()); |
+ if (pulse_audio_manager.get()) |
+ GetAudioOutputDeviceNamesImpl(pulse_audio_manager.get()); |
+ else |
+ VLOG(2) << "No pulseaudio on this system."; |
tommi (sloooow) - chröme
2013/09/05 11:54:45
LOG(WARNING)? That way we'll be able to see from
|
+ } |
#endif // defined(USE_PULSEAUDIO) |
+#if defined(USE_ALSA) |
+ { |
+ VLOG(2) << "Testing AudioManagerLinux."; |
+ scoped_ptr<AudioManager> alsa_audio_manager(new AudioManagerLinux()); |
+ GetAudioOutputDeviceNamesImpl(alsa_audio_manager.get()); |
+ } |
+#endif // defined(USE_ALSA) |
} |
} // namespace media |