diff --git a/webrtc/modules/audio_processing/agc/test/agc_manager_integrationtest.cc b/webrtc/modules/audio_processing/agc/test/agc_manager_integrationtest.cc index 3a54652a79..9dbbc22249 100644 --- a/webrtc/modules/audio_processing/agc/test/agc_manager_integrationtest.cc +++ b/webrtc/modules/audio_processing/agc/test/agc_manager_integrationtest.cc @@ -39,7 +39,7 @@ class AgcManagerTest : public ::testing::Test { manager_(new AgcManager(VoEExternalMedia::GetInterface(voe_), VoEVolumeControl::GetInterface(voe_), agc_, - AudioProcessing::Create(0))), + AudioProcessing::Create())), channel_(-1) { } diff --git a/webrtc/modules/audio_processing/agc/test/agc_test.cc b/webrtc/modules/audio_processing/agc/test/agc_test.cc index d855f42f2e..413b3b0c6d 100644 --- a/webrtc/modules/audio_processing/agc/test/agc_test.cc +++ b/webrtc/modules/audio_processing/agc/test/agc_test.cc @@ -103,7 +103,7 @@ void RunAgc() { FakeVoEExternalMedia media; MockVoEVolumeControl volume; Agc* agc = new Agc; - AudioProcessing* audioproc = AudioProcessing::Create(0); + AudioProcessing* audioproc = AudioProcessing::Create(); ASSERT_TRUE(audioproc != NULL); AgcManager manager(&media, &volume, agc, audioproc); diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 73b3f2709b..2483841ec8 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -136,10 +136,6 @@ class GainControlForNewAgc : public GainControl, public VolumeCallbacks { int volume_; }; -AudioProcessing* AudioProcessing::Create(int id) { - return Create(); -} - AudioProcessing* AudioProcessing::Create() { Config config; return Create(config); diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc index 49bcf9459b..ce4526b272 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -19,7 +19,7 @@ extern "C" { namespace webrtc { TEST(EchoCancellationInternalTest, DelayCorrection) { - scoped_ptr ap(AudioProcessing::Create(0)); + scoped_ptr ap(AudioProcessing::Create()); EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true)); @@ -49,7 +49,7 @@ TEST(EchoCancellationInternalTest, DelayCorrection) { } TEST(EchoCancellationInternalTest, ReportedDelay) { - scoped_ptr ap(AudioProcessing::Create(0)); + scoped_ptr ap(AudioProcessing::Create()); EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true)); diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index 975445052a..d23a9ae422 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -199,8 +199,6 @@ class AudioProcessing { static AudioProcessing* Create(); // Allows passing in an optional configuration at create-time. static AudioProcessing* Create(const Config& config); - // TODO(ajm): Deprecated; remove all calls to it. - static AudioProcessing* Create(int id); virtual ~AudioProcessing() {} // Initializes internal states, while retaining all user settings. This diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc index 178309506d..e44c1a784f 100644 --- a/webrtc/voice_engine/voe_base_impl.cc +++ b/webrtc/voice_engine/voe_base_impl.cc @@ -432,7 +432,7 @@ int VoEBaseImpl::Init(AudioDeviceModule* external_adm, } if (!audioproc) { - audioproc = AudioProcessing::Create(VoEId(_shared->instance_id(), -1)); + audioproc = AudioProcessing::Create(); if (!audioproc) { LOG(LS_ERROR) << "Failed to create AudioProcessing."; _shared->SetLastError(VE_NO_MEMORY); diff --git a/webrtc/voice_engine/voe_base_unittest.cc b/webrtc/voice_engine/voe_base_unittest.cc index 6057534d04..cfebe0e46f 100644 --- a/webrtc/voice_engine/voe_base_unittest.cc +++ b/webrtc/voice_engine/voe_base_unittest.cc @@ -36,7 +36,7 @@ class VoEBaseTest : public ::testing::Test { }; TEST_F(VoEBaseTest, AcceptsAudioProcessingPtr) { - AudioProcessing* audioproc = AudioProcessing::Create(0); + AudioProcessing* audioproc = AudioProcessing::Create(); EXPECT_EQ(0, base_->Init(adm_.get(), audioproc)); EXPECT_EQ(audioproc, base_->audio_processing()); }