Allow an external audio processing module to be used in WebRTC

webrtc/voice_engine/voe_base_unittest.cc

Index: webrtc/voice_engine/voe_base_unittest.cc
diff --git a/webrtc/voice_engine/voe_base_unittest.cc b/webrtc/voice_engine/voe_base_unittest.cc
index a300f3b75e9cfee6b598344ffea998a6535e5b82..55f9634a837b200d00228915f8cc79ba7e3b8e58 100644
--- a/webrtc/voice_engine/voe_base_unittest.cc
+++ b/webrtc/voice_engine/voe_base_unittest.cc
@@ -21,17 +21,8 @@ namespace webrtc {
 
 class VoEBaseTest : public VoiceEngineFixture {};
 
-TEST_F(VoEBaseTest, InitWithExternalAudioDeviceAndAudioProcessing) {
-  AudioProcessing* audioproc = AudioProcessing::Create();
-  EXPECT_EQ(0, base_->Init(&adm_, audioproc));
-  EXPECT_EQ(audioproc, base_->audio_processing());
-  EXPECT_EQ(0, base_->LastError());
-}
-
 TEST_F(VoEBaseTest, InitWithExternalAudioDevice) {
-  EXPECT_EQ(nullptr, base_->audio_processing());
-  EXPECT_EQ(0, base_->Init(&adm_, nullptr));
-  EXPECT_NE(nullptr, base_->audio_processing());
+  EXPECT_EQ(0, base_->Init(&adm_, apm_.get()));
   EXPECT_EQ(0, base_->LastError());
 }
 
@@ -41,15 +32,14 @@ TEST_F(VoEBaseTest, CreateChannelBeforeInitShouldFail) {
 }
 
 TEST_F(VoEBaseTest, CreateChannelAfterInit) {
-  EXPECT_EQ(0, base_->Init(&adm_, nullptr));
+  EXPECT_EQ(0, base_->Init(&adm_, apm_.get(), nullptr));
   int channelID = base_->CreateChannel();
   EXPECT_NE(channelID, -1);
   EXPECT_EQ(0, base_->DeleteChannel(channelID));
 }
 
 TEST_F(VoEBaseTest, AssociateSendChannel) {
-  AudioProcessing* audioproc = AudioProcessing::Create();
-  EXPECT_EQ(0, base_->Init(&adm_, audioproc));
+  EXPECT_EQ(0, base_->Init(&adm_, apm_.get()));
 
   const int channel_1 = base_->CreateChannel();