Revert of Add aecdump support to audioproc_f.

webrtc/modules/audio_processing/test/test_utils.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 25 matching lines @@
 
   void WriteSamples(const int16_t* samples, size_t num_samples);
   void WriteSamples(const float* samples, size_t num_samples);
 
  private:
   FILE* file_handle_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RawFile);
 };
 
-// Reads ChannelBuffers from a provided WavReader.
-class ChannelBufferWavReader final {
- public:
-  explicit ChannelBufferWavReader(rtc::scoped_ptr<WavReader> file);
-
-  // Reads data from the file according to the |buffer| format. Returns false if
-  // a full buffer can't be read from the file.
-  bool Read(ChannelBuffer<float>* buffer);
-
- private:
-  rtc::scoped_ptr<WavReader> file_;
-  std::vector<float> interleaved_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(ChannelBufferWavReader);
-};
-
-// Writes ChannelBuffers to a provided WavWriter.
-class ChannelBufferWavWriter final {
- public:
-  explicit ChannelBufferWavWriter(rtc::scoped_ptr<WavWriter> file);
-  void Write(const ChannelBuffer<float>& buffer);
-
- private:
-  rtc::scoped_ptr<WavWriter> file_;
-  std::vector<float> interleaved_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(ChannelBufferWavWriter);
-};
-
 void WriteIntData(const int16_t* data,
                   size_t length,
                   WavWriter* wav_file,
                   RawFile* raw_file);
 
 void WriteFloatData(const float* const* data,
                     int samples_per_channel,
                     int num_channels,
                     WavWriter* wav_file,
                     RawFile* raw_file);
@@ skipping 55 matching lines @@
   return values;
 }
 
 // Parses the array geometry from the command line.
 //
 // If a vector with size != num_mics is returned, an error has occurred and an
 // appropriate error message has been printed to stdout.
 std::vector<Point> ParseArrayGeometry(const std::string& mic_positions,
                                       size_t num_mics);
 
-// Same as above, but without the num_mics check for when it isn't available.
-std::vector<Point> ParseArrayGeometry(const std::string& mic_positions);
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_