Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7cc0a21e7f5bb33127a0c42565d3e81f4a2b1e63..e7598f26d232b6f5ddc821a235a0f02d42b6b08a 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -64,7 +64,6 @@
 #include "content/renderer/java/java_bridge_dispatcher.h"
 #include "content/renderer/load_progress_tracker.h"
 #include "content/renderer/media/audio_message_filter.h"
-#include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_impl.h"
@@ -94,6 +93,7 @@
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/base/message_loop_factory.h"
+#include "media/filters/audio_renderer_base.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
@@ -2150,8 +2150,8 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
 
     // Add the chrome specific audio renderer, using audio_source_provider
     // as the sink.
-    AudioRendererImpl* audio_renderer =
-        new AudioRendererImpl(audio_source_provider);
+    media::AudioRendererBase* audio_renderer =
+        new media::AudioRendererBase(audio_source_provider);
     collection->AddAudioRenderer(audio_renderer);
   }