Revert of Removed the inheritance from ProcessingComponent for EchoCancellerImpl.

webrtc/modules/audio_processing/echo_cancellation_impl.h

Index: webrtc/modules/audio_processing/echo_cancellation_impl.h
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h
index 194819984efad6c33941b839b65e0d9ab4016be2..fbc2bcc465383a99941a517788c11fea02058d0a 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.h
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h
@@ -13,7 +13,6 @@
 
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/swap_queue.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -23,7 +22,8 @@
 
 class AudioBuffer;
 
-class EchoCancellationImpl : public EchoCancellation {
+class EchoCancellationImpl : public EchoCancellation,
+                             public ProcessingComponent {
  public:
   EchoCancellationImpl(const AudioProcessing* apm,
                        rtc::CriticalSection* crit_render,
@@ -39,8 +39,9 @@
   SuppressionLevel suppression_level() const override;
   bool is_drift_compensation_enabled() const override;
 
-  void Initialize();
-  void SetExtraOptions(const Config& config);
+  // ProcessingComponent implementation.
+  int Initialize() override;
+  void SetExtraOptions(const Config& config) override;
   bool is_delay_agnostic_enabled() const;
   bool is_extended_filter_enabled() const;
   bool is_next_generation_aec_enabled() const;
@@ -50,8 +51,6 @@
   void ReadQueuedRenderData();
 
  private:
-  class Canceller;
-
   // EchoCancellation implementation.
   int Enable(bool enable) override;
   int enable_drift_compensation(bool enable) override;
@@ -70,10 +69,15 @@
 
   struct AecCore* aec_core() const override;
 
-  size_t num_handles_required() const;
+  // ProcessingComponent implementation.
+  void* CreateHandle() const override;
+  int InitializeHandle(void* handle) const override;
+  int ConfigureHandle(void* handle) const override;
+  void DestroyHandle(void* handle) const override;
+  size_t num_handles_required() const override;
+  int GetHandleError(void* handle) const override;
 
   void AllocateRenderQueue();
-  int Configure();
 
   // Not guarded as its public API is thread safe.
   const AudioProcessing* apm_;
@@ -81,7 +85,6 @@
   rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_);
   rtc::CriticalSection* const crit_capture_;
 
-  bool enabled_ = false;
   bool drift_compensation_enabled_ GUARDED_BY(crit_capture_);
   bool metrics_enabled_ GUARDED_BY(crit_capture_);
   SuppressionLevel suppression_level_ GUARDED_BY(crit_capture_);
@@ -101,9 +104,6 @@
   // Lock protection not needed.
   std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
       render_signal_queue_;
-
-  std::vector<std::unique_ptr<Canceller>> cancellers_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCancellationImpl);
 };
 
 }  // namespace webrtc