From 83bd29081c750332b7d4110e1186403e0d40a461 Mon Sep 17 00:00:00 2001
From: Ivo Creusen <ivoc@webrtc.org>
Date: Wed, 31 Jan 2018 12:33:51 +0100
Subject: [PATCH] Remove the AudioProcessing::Create methods.

Due to the growing number of arguments, these functions are being replaced by the AudioProcessingBuilder class.

Bug: webrtc:8668
Change-Id: Ic3936fbd47d92eac22a857a678dca5fd8c029d8b
Reviewed-on: https://webrtc-review.googlesource.com/46241
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21826}
---
 .../audio_processing/audio_processing_impl.cc | 41 -------------------
 .../include/audio_processing.h                | 32 ---------------
 2 files changed, 73 deletions(-)

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index accd03b255..08d1ac0fef 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -370,47 +370,6 @@ AudioProcessing* AudioProcessingBuilder::Create(const webrtc::Config& config) {
   return apm;
 }
 
-AudioProcessing* AudioProcessing::Create() {
-  webrtc::Config config;
-  return Create(config, nullptr, nullptr, nullptr, nullptr);
-}
-
-AudioProcessing* AudioProcessing::Create(const webrtc::Config& config) {
-  return Create(config, nullptr, nullptr, nullptr, nullptr);
-}
-
-AudioProcessing* AudioProcessing::Create(const webrtc::Config& config,
-                                         NonlinearBeamformer* beamformer) {
-  return Create(config, nullptr, nullptr, nullptr, beamformer);
-}
-
-AudioProcessing* AudioProcessing::Create(
-    const webrtc::Config& config,
-    std::unique_ptr<CustomProcessing> capture_post_processor,
-    std::unique_ptr<EchoControlFactory> echo_control_factory,
-    NonlinearBeamformer* beamformer) {
-  return Create(config, std::move(capture_post_processor), nullptr,
-                std::move(echo_control_factory), beamformer);
-}
-
-AudioProcessing* AudioProcessing::Create(
-    const webrtc::Config& config,
-    std::unique_ptr<CustomProcessing> capture_post_processor,
-    std::unique_ptr<CustomProcessing> render_pre_processor,
-    std::unique_ptr<EchoControlFactory> echo_control_factory,
-    NonlinearBeamformer* beamformer) {
-  AudioProcessingImpl* apm = new rtc::RefCountedObject<AudioProcessingImpl>(
-      config, std::move(capture_post_processor),
-      std::move(render_pre_processor), std::move(echo_control_factory), nullptr,
-      beamformer);
-  if (apm->Initialize() != kNoError) {
-    delete apm;
-    apm = nullptr;
-  }
-
-  return apm;
-}
-
 AudioProcessingImpl::AudioProcessingImpl(const webrtc::Config& config)
     : AudioProcessingImpl(config, nullptr, nullptr, nullptr, nullptr, nullptr) {
 }
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 31b41e7ba3..c8a1e55c97 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -314,38 +314,6 @@ class AudioProcessing : public rtc::RefCountInterface {
     kStereoAndKeyboard
   };
 
-  // Creates an APM instance. Use one instance for every primary audio stream
-  // requiring processing. On the client-side, this would typically be one
-  // instance for the near-end stream, and additional instances for each far-end
-  // stream which requires processing. On the server-side, this would typically
-  // be one instance for every incoming stream.
-  // The Create functions are deprecated, please use AudioProcessingBuilder
-  // instead.
-  // TODO(bugs.webrtc.org/8668): Remove these Create functions when all callers
-  // have moved to AudioProcessingBuilder.
-  static AudioProcessing* Create();
-  // Allows passing in an optional configuration at create-time.
-  static AudioProcessing* Create(const webrtc::Config& config);
-  // Deprecated. Use the Create below, with nullptr CustomProcessing.
-  RTC_DEPRECATED
-  static AudioProcessing* Create(const webrtc::Config& config,
-                                 NonlinearBeamformer* beamformer);
-
-  // Will be deprecated and removed as part of webrtc:8665. Use the
-  // Create below, with nullptr CustomProcessing.
-  static AudioProcessing* Create(
-      const webrtc::Config& config,
-      std::unique_ptr<CustomProcessing> capture_post_processor,
-      std::unique_ptr<EchoControlFactory> echo_control_factory,
-      NonlinearBeamformer* beamformer);
-
-  // Allows passing in optional user-defined processing modules.
-  static AudioProcessing* Create(
-      const webrtc::Config& config,
-      std::unique_ptr<CustomProcessing> capture_post_processor,
-      std::unique_ptr<CustomProcessing> render_pre_processor,
-      std::unique_ptr<EchoControlFactory> echo_control_factory,
-      NonlinearBeamformer* beamformer);
   ~AudioProcessing() override {}
 
   // Initializes internal states, while retaining all user settings. This