Avoid that previous settings in APM are overwritten by WebRtcVoiceEngine

webrtc/modules/audio_processing/include/mock_audio_processing.h

Index: webrtc/modules/audio_processing/include/mock_audio_processing.h
diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/webrtc/modules/audio_processing/include/mock_audio_processing.h
index d43351e1deb998bd26cbdb57fb281435ad390664..048803ad9b2a9994d5963a05cd5fffead2203674 100644
--- a/webrtc/modules/audio_processing/include/mock_audio_processing.h
+++ b/webrtc/modules/audio_processing/include/mock_audio_processing.h
@@ -139,7 +139,9 @@ class MockAudioProcessing : public AudioProcessing {
                                ChannelLayout capture_output_layout,
                                ChannelLayout render_input_layout));
   MOCK_METHOD1(Initialize, int(const ProcessingConfig& processing_config));
-  MOCK_METHOD1(ApplyConfig, void(const Config& config));
+  virtual void ApplyConfig(const webrtc::AudioProcessing::Config& config) {
+    apm_config_ = config;
+  }

[Taylor Brandstetter, 2017/07/25 00:04:37]

This is now partly a fake and partly a mock; I think it would be better if the
test itself configured the mock's behavior, for example using "testing::SaveArg"
and "testing::ReturnPointee" to save the previously set value and return it.

[peah-webrtc, 2017/07/25 21:40:21]

Very valid point! And thanks for the suggestions about SaveArg and
ReturnPointee, I did not know about those!

I have updated the CL with a patch with that change. Please take a look!

   MOCK_METHOD1(SetExtraOptions, void(const webrtc::Config& config));
   MOCK_CONST_METHOD0(proc_sample_rate_hz, int());
   MOCK_CONST_METHOD0(proc_split_sample_rate_hz, int());
@@ -211,7 +213,9 @@ class MockAudioProcessing : public AudioProcessing {
     return voice_detection_.get();
   }
 
-  MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
+  virtual webrtc::AudioProcessing::Config GetConfig() const {
+    return apm_config_;
+  }
 
  private:
   std::unique_ptr<MockEchoCancellation> echo_cancellation_;
@@ -221,6 +225,7 @@ class MockAudioProcessing : public AudioProcessing {
   std::unique_ptr<MockLevelEstimator> level_estimator_;
   std::unique_ptr<MockNoiseSuppression> noise_suppression_;
   std::unique_ptr<MockVoiceDetection> voice_detection_;
+  webrtc::AudioProcessing::Config apm_config_;
 };
 
 }  // namespace test