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

trunk/src/content/common/media/media_param_traits.cc

Index: trunk/src/content/common/media/media_param_traits.cc
===================================================================
--- trunk/src/content/common/media/media_param_traits.cc	(revision 240587)
+++ trunk/src/content/common/media/media_param_traits.cc	(working copy)
@@ -25,14 +25,13 @@
   m->WriteInt(p.frames_per_buffer());
   m->WriteInt(p.channels());
   m->WriteInt(p.input_channels());
-  m->WriteInt(p.effects());
 }
 
 bool ParamTraits<AudioParameters>::Read(const Message* m,
                                         PickleIterator* iter,
                                         AudioParameters* r) {
   int format, channel_layout, sample_rate, bits_per_sample,
-      frames_per_buffer, channels, input_channels, effects;
+      frames_per_buffer, channels, input_channels;
 
   if (!m->ReadInt(iter, &format) ||
       !m->ReadInt(iter, &channel_layout) ||
@@ -40,14 +39,11 @@
       !m->ReadInt(iter, &bits_per_sample) ||
       !m->ReadInt(iter, &frames_per_buffer) ||
       !m->ReadInt(iter, &channels) ||
-      !m->ReadInt(iter, &input_channels) ||
-      !m->ReadInt(iter, &effects))
+      !m->ReadInt(iter, &input_channels))
     return false;
-  AudioParameters params(static_cast<AudioParameters::Format>(format),
-         static_cast<ChannelLayout>(channel_layout), channels,
-         input_channels, sample_rate, bits_per_sample, frames_per_buffer,
-         effects);
-  *r = params;
+  r->Reset(static_cast<AudioParameters::Format>(format),
+           static_cast<ChannelLayout>(channel_layout), channels,
+           input_channels, sample_rate, bits_per_sample, frames_per_buffer);
   if (!r->IsValid())
     return false;
   return true;