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

trunk/src/content/public/common/media_stream_request.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 88 matching lines @@
   // Only applicable to audio devices.
   std::string matched_output_device_id;
 
   // The device's "friendly" name. Not guaranteed to be unique.
   std::string name;
 
   // Contains properties that match directly with those with the same name
   // in media::AudioParameters.
   struct AudioDeviceParameters {
     AudioDeviceParameters()
-        : sample_rate(), channel_layout(), frames_per_buffer(), effects() {
+        : sample_rate(), channel_layout(), frames_per_buffer() {
     }
 
     AudioDeviceParameters(int sample_rate, int channel_layout,
-        int frames_per_buffer)
+                          int frames_per_buffer)
         : sample_rate(sample_rate),
           channel_layout(channel_layout),
-          frames_per_buffer(frames_per_buffer),
-          effects() {
+          frames_per_buffer(frames_per_buffer) {
     }
 
     // Preferred sample rate in samples per second for the device.
     int sample_rate;
 
     // Preferred channel configuration for the device.
     // TODO(henrika): ideally, we would like to use media::ChannelLayout here
     // but including media/base/channel_layout.h violates checkdeps rules.
     int channel_layout;
 
     // Preferred number of frames per buffer for the device.  This is filled
     // in on the browser side and can be used by the renderer to match the
     // expected browser side settings and avoid unnecessary buffering.
     // See media::AudioParameters for more.
     int frames_per_buffer;
-
-    // See media::AudioParameters::PlatformEffectsMask.
-    int effects;
   };
 
   // These below two member variables are valid only when the type of device is
   // audio (i.e. IsAudioMediaType returns true).
 
   // Contains the device properties of the capture device.
   AudioDeviceParameters input;
 
   // If the capture device has an associated output device (e.g. headphones),
   // this will contain the properties for the output device.  If no such device
@@ skipping 80 matching lines @@
 };
 
 // Callback used return results of media access requests.
 typedef base::Callback<void(
     const MediaStreamDevices& devices,
     scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_