Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1204)

Unified Diff: media/audio/audio_manager_unittest.cc

Issue 24072002: Implement GetAudioOutputDeviceNames for Mac OS X. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test failures on platforms without output enumeration. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/audio/mac/audio_manager_mac.h » ('j') | media/audio/mac/audio_manager_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_unittest.cc
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
index 859e0fe77b2e76c59a017528186cd4188c2adc34..4fefe8506d0ebdf66eb91195d9c80fbbb6872125 100644
--- a/media/audio/audio_manager_unittest.cc
+++ b/media/audio/audio_manager_unittest.cc
@@ -32,6 +32,8 @@ void GetAudioOutputDeviceNamesImpl(AudioManager* audio_manager) {
}
TEST(AudioManagerTest, GetAudioOutputDeviceNames) {
+ // On Linux, we may be able to test both the Alsa and Pulseaudio
+ // versions of the audio manager.
#if defined(USE_PULSEAUDIO)
{
VLOG(2) << "Testing AudioManagerPulse.";
@@ -49,6 +51,12 @@ TEST(AudioManagerTest, GetAudioOutputDeviceNames) {
GetAudioOutputDeviceNamesImpl(alsa_audio_manager.get());
}
#endif // defined(USE_ALSA)
+
+#if defined(OS_MACOSX)
+ VLOG(2) << "Testing platform-default AudioManager.";
+ scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
+ GetAudioOutputDeviceNamesImpl(audio_manager.get());
+#endif // defined(OS_MACOSX)
}
} // namespace media
« no previous file with comments | « no previous file | media/audio/mac/audio_manager_mac.h » ('j') | media/audio/mac/audio_manager_mac.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698