Revert 240548 "Enable platform echo cancellation through the Aud..."

trunk/src/media/base/channel_mixer_unittest.cc

Index: trunk/src/media/base/channel_mixer_unittest.cc
===================================================================
--- trunk/src/media/base/channel_mixer_unittest.cc	(revision 240589)
+++ trunk/src/media/base/channel_mixer_unittest.cc	(working copy)
@@ -100,26 +100,20 @@
   scoped_ptr<AudioBus> input_bus = AudioBus::Create(input_channels, kFrames);
   AudioParameters input_audio(AudioParameters::AUDIO_PCM_LINEAR,
                               input_layout,
-                              input_layout == CHANNEL_LAYOUT_DISCRETE ?
-                                  input_channels :
-                                  ChannelLayoutToChannelCount(input_layout),
-                              0,
                               AudioParameters::kAudioCDSampleRate, 16,
-                              kFrames,
-                              AudioParameters::NO_EFFECTS);
+                              kFrames);
+  if (input_layout == CHANNEL_LAYOUT_DISCRETE)
+    input_audio.SetDiscreteChannels(input_channels);
 
   ChannelLayout output_layout = GetParam().output_layout;
   int output_channels = GetParam().output_channels;
   scoped_ptr<AudioBus> output_bus = AudioBus::Create(output_channels, kFrames);
   AudioParameters output_audio(AudioParameters::AUDIO_PCM_LINEAR,
                                output_layout,
-                               output_layout == CHANNEL_LAYOUT_DISCRETE ?
-                                  output_channels :
-                                  ChannelLayoutToChannelCount(output_layout),
-                               0,
                                AudioParameters::kAudioCDSampleRate, 16,
-                               kFrames,
-                               AudioParameters::NO_EFFECTS);
+                               kFrames);
+  if (output_layout == CHANNEL_LAYOUT_DISCRETE)
+    output_audio.SetDiscreteChannels(output_channels);
 
   const float* channel_values = GetParam().channel_values;
   ASSERT_EQ(input_bus->channels(), GetParam().num_channel_values);