Revert 187936 "Pass more detailed audio hardware configuration i..."

media/audio/audio_parameters.cc

Index: media/audio/audio_parameters.cc
===================================================================
--- media/audio/audio_parameters.cc	(revision 189875)
+++ media/audio/audio_parameters.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "media/audio/audio_parameters.h"
 
-#include "base/logging.h"
 #include "media/base/limits.h"
 
 namespace media {
@@ -45,19 +44,16 @@
 }
 
 void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
-                            int channels, int input_channels,
+                            int input_channels,
                             int sample_rate, int bits_per_sample,
                             int frames_per_buffer) {
-  if (channel_layout != CHANNEL_LAYOUT_DISCRETE)
-    DCHECK_EQ(channels, ChannelLayoutToChannelCount(channel_layout));
-
   format_ = format;
   channel_layout_ = channel_layout;
-  channels_ = channels;
   input_channels_ = input_channels;
   sample_rate_ = sample_rate;
   bits_per_sample_ = bits_per_sample;
   frames_per_buffer_ = frames_per_buffer;
+  channels_ = ChannelLayoutToChannelCount(channel_layout);
 }
 
 bool AudioParameters::IsValid() const {
@@ -89,9 +85,4 @@
   return channels_ * bits_per_sample_ / 8;
 }
 
-void AudioParameters::SetDiscreteChannels(int channels) {
-  channel_layout_ = CHANNEL_LAYOUT_DISCRETE;
-  channels_ = channels;
-}
-
 }  // namespace media