Adding pulseaudio input support to chrome

media/audio/linux/audio_manager_linux.cc

Index: media/audio/linux/audio_manager_linux.cc
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index ff6cbbd088934aa8c9fd87aef6f9db6c029f9ba3..17461b96a50ad0c7a98aea33be04149ad1deb4a3 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -16,7 +16,7 @@
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #if defined(USE_PULSEAUDIO)
-#include "media/audio/pulse/pulse_output.h"
+#include "media/audio/pulse/audio_manager_pulse.h"
 #endif
 #if defined(USE_CRAS)
 #include "media/audio/linux/cras_input.h"
@@ -303,12 +303,6 @@ AudioOutputStream* AudioManagerLinux::MakeOutputStream(
   }
 #endif
 
-#if defined(USE_PULSEAUDIO)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
-    return new PulseAudioOutputStream(params, this);
-  }
-#endif
-
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlsaOutputDevice)) {
@@ -337,6 +331,14 @@ AudioInputStream* AudioManagerLinux::MakeInputStream(
 }
 
 AudioManager* CreateAudioManager() {
+#if defined(USE_PULSEAUDIO)

[DaleCurtis, 2013/02/15 00:28:51]

Can we just remove this #define now?

[no longer working on chromium, 2013/02/15 16:07:33]

My plan is to remove the switch in another CL, after testing the audio
performance for the major products.
Quite likely we need to tweak some params like the default buffer size.

+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
+    AudioManager* manager = AudioManagerPulse::Create();
+    if (manager)
+      return manager;
+  }
+ #endif
+
   return new AudioManagerLinux();
 }