This CL renames variables and method and removes some one-line methods inside the APM

webrtc/modules/audio_processing/include/mock_audio_processing.h

 /*
  *  Copyright (c) 2013 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 164 matching lines @@
         noise_suppression_(new MockNoiseSuppression),
         voice_detection_(new MockVoiceDetection) {
   }
 
   virtual ~MockAudioProcessing() {
   }
 
   MOCK_METHOD0(Initialize,
       int());
   MOCK_METHOD6(Initialize,
-      int(int sample_rate_hz,
-          int output_sample_rate_hz,
-          int reverse_sample_rate_hz,
-          ChannelLayout input_layout,
-          ChannelLayout output_layout,
-          ChannelLayout reverse_layout));
+               int(int capture_input_sample_rate_hz,
+                   int capture_output_sample_rate_hz,
+                   int render_sample_rate_hz,
+                   ChannelLayout capture_input_layout,
+                   ChannelLayout capture_output_layout,
+                   ChannelLayout render_input_layout));
   MOCK_METHOD1(Initialize,
       int(const ProcessingConfig& processing_config));
   MOCK_METHOD1(ApplyConfig, void(const Config& config));
   MOCK_METHOD1(SetExtraOptions, void(const webrtc::Config& config));
   MOCK_METHOD1(set_sample_rate_hz,
       int(int rate));
   MOCK_CONST_METHOD0(input_sample_rate_hz,
       int());
   MOCK_CONST_METHOD0(sample_rate_hz,
       int());
@@ skipping 23 matching lines @@
           float* const* dest));
   MOCK_METHOD4(ProcessStream,
                int(const float* const* src,
                    const StreamConfig& input_config,
                    const StreamConfig& output_config,
                    float* const* dest));
   MOCK_METHOD1(AnalyzeReverseStream,
       int(AudioFrame* frame));
   MOCK_METHOD1(ProcessReverseStream, int(AudioFrame* frame));
   MOCK_METHOD4(AnalyzeReverseStream,
-      int(const float* const* data, size_t frames, int sample_rate_hz,
-          ChannelLayout input_layout));
+               int(const float* const* data,
+                   size_t samples_per_channel,
+                   int sample_rate_hz,
+                   ChannelLayout layout));
   MOCK_METHOD4(ProcessReverseStream,
                int(const float* const* src,
                    const StreamConfig& input_config,
                    const StreamConfig& output_config,
                    float* const* dest));
   MOCK_METHOD1(set_stream_delay_ms,
       int(int delay));
   MOCK_CONST_METHOD0(stream_delay_ms,
       int());
   MOCK_CONST_METHOD0(was_stream_delay_set,
@@ skipping 42 matching lines @@
   std::unique_ptr<MockGainControl> gain_control_;
   std::unique_ptr<MockHighPassFilter> high_pass_filter_;
   std::unique_ptr<MockLevelEstimator> level_estimator_;
   std::unique_ptr<MockNoiseSuppression> noise_suppression_;
   std::unique_ptr<MockVoiceDetection> voice_detection_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_