Bypass audio resampler on XP / non-WASAPI wave out path.

media/audio/audio_manager_base.cc

Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index dd2d1bd50598e26fffcfd670ac9a823d729a0234..3b77aa4f54722d0ac823ade611b78f3fa789cb8d 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -160,8 +160,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
   if (cmd_line->HasSwitch(switches::kEnableAudioOutputResampler) &&
       params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     scoped_refptr<AudioOutputDispatcher> dispatcher = new AudioOutputResampler(
-        this, params,
-        GetPreferredLowLatencyOutputStreamParameters(params.channel_layout()),
+        this, params, GetPreferredLowLatencyOutputStreamParameters(params),
         close_delay);
     output_dispatchers_[params] = dispatcher;
     return new AudioOutputProxy(dispatcher);
@@ -279,7 +278,7 @@ void AudioManagerBase::ShutdownOnAudioThread() {
 }
 
 AudioParameters AudioManagerBase::GetPreferredLowLatencyOutputStreamParameters(
-    ChannelLayout channel_layout) {
+    const AudioParameters& input_params) {
 #if defined(OS_IOS)
   // IOS implements audio input only.
   NOTIMPLEMENTED();
@@ -288,7 +287,7 @@ AudioParameters AudioManagerBase::GetPreferredLowLatencyOutputStreamParameters(
   // TODO(dalecurtis): This should include bits per channel and channel layout
   // eventually.
   return AudioParameters(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
       GetAudioHardwareSampleRate(), 16, GetAudioHardwareBufferSize());
 #endif  // defined(OS_IOS)
 }