Allow an external audio processing module to be used in WebRTC

webrtc/media/engine/apm_helpers_unittest.cc

Index: webrtc/media/engine/apm_helpers_unittest.cc
diff --git a/webrtc/media/engine/apm_helpers_unittest.cc b/webrtc/media/engine/apm_helpers_unittest.cc
index f7c418d3324286a63dff6418594b32b4d006eb58..2746da6841cf84a8b02672ea8342fcbffb1c6462 100644
--- a/webrtc/media/engine/apm_helpers_unittest.cc
+++ b/webrtc/media/engine/apm_helpers_unittest.cc
@@ -33,19 +33,15 @@ struct TestHelper {
     // This replicates the conditions from voe_auto_test.
     Config config;
     config.Set<ExperimentalAgc>(new ExperimentalAgc(false));
+    apm_ = rtc::scoped_refptr<AudioProcessing>(AudioProcessing::Create(config));
     EXPECT_EQ(0, voe_wrapper_.base()->Init(
-        &mock_audio_device_,
-        AudioProcessing::Create(config),
-        MockAudioDecoderFactory::CreateEmptyFactory()));
+                     &mock_audio_device_, apm_,
+                     MockAudioDecoderFactory::CreateEmptyFactory()));
   }
 
-  AudioProcessing* apm() {
-    return voe_wrapper_.base()->audio_processing();
-  }
+  AudioProcessing* apm() { return apm_.get(); }
 
-  const AudioProcessing* apm() const {
-    return voe_wrapper_.base()->audio_processing();
-  }
+  const AudioProcessing* apm() const { return apm_.get(); }
 
   test::MockAudioDeviceModule* adm() {
     return &mock_audio_device_;
@@ -77,6 +73,7 @@ struct TestHelper {
  private:
   testing::NiceMock<test::MockAudioDeviceModule> mock_audio_device_;
   cricket::VoEWrapper voe_wrapper_;
+  rtc::scoped_refptr<AudioProcessing> apm_;
 };
 }  // namespace