Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

media/filters/pipeline_integration_test_base.cc

Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 6fcead09f321b6cf9452107cefbf454e447a3647..fb348f16cd64a49a5909ffda5d5f8c0312f2137b 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -6,12 +6,13 @@
 
 #include "base/bind.h"
 #include "media/base/media_log.h"
+#include "media/audio/null_audio_sink.h"
+#include "media/filters/audio_renderer_base.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
-#include "media/filters/null_audio_renderer.h"
 
 using ::testing::AnyNumber;
 
@@ -177,7 +178,7 @@ PipelineIntegrationTestBase::CreateFilterCollection(
                  base::Unretained(this)),
       false);
   collection->AddVideoRenderer(renderer_);
-  collection->AddAudioRenderer(new NullAudioRenderer());
+  collection->AddAudioRenderer(new AudioRendererBase(new NullAudioSink()));
   return collection.Pass();
 }