Revert of MediaStream audio: Refactor 3 separate "glue" implementations into one.

content/renderer/media/webrtc_audio_device_impl.cc

Index: content/renderer/media/webrtc_audio_device_impl.cc
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index 7f46506fada893b16edde60a8ebd81d4042d7cc5..00807a909f1beedcee680bbaaf13922359385892 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -4,13 +4,15 @@
 
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 
+#include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
-#include "content/renderer/media/webrtc/processed_local_audio_source.h"
+#include "content/renderer/media/media_stream_audio_processor.h"
+#include "content/renderer/media/webrtc_audio_capturer.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
+#include "content/renderer/render_thread_impl.h"
 #include "media/audio/sample_rates.h"
-#include "media/base/audio_bus.h"
 #include "media/base/audio_parameters.h"
 
 using media::AudioParameters;
@@ -358,7 +360,7 @@
   DCHECK(signaling_thread_checker_.CalledOnValidThread());
 
   // There is no way to report a correct delay value to WebRTC since there
-  // might be multiple ProcessedLocalAudioSource instances.
+  // might be multiple WebRtcAudioCapturer instances.
   NOTREACHED();
   return -1;
 }
@@ -419,8 +421,7 @@
   return true;
 }
 
-void WebRtcAudioDeviceImpl::AddAudioCapturer(
-    ProcessedLocalAudioSource* capturer) {
+void WebRtcAudioDeviceImpl::AddAudioCapturer(WebRtcAudioCapturer* capturer) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DVLOG(1) << "WebRtcAudioDeviceImpl::AddAudioCapturer()";
   DCHECK(capturer);
@@ -432,8 +433,7 @@
   capturers_.push_back(capturer);
 }
 
-void WebRtcAudioDeviceImpl::RemoveAudioCapturer(
-    ProcessedLocalAudioSource* capturer) {
+void WebRtcAudioDeviceImpl::RemoveAudioCapturer(WebRtcAudioCapturer* capturer) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DVLOG(1) << "WebRtcAudioDeviceImpl::RemoveAudioCapturer()";
   DCHECK(capturer);