Revert of media: Introduce Renderer interface and RendererImpl.

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 039a3d89ee05bbee69c8a0436ac68a803feeff10..a6352868faa6c1b961920a933e3818952ae26103 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -15,7 +15,6 @@
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/opus_audio_decoder.h"
-#include "media/filters/renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
 
 using ::testing::_;
@@ -38,6 +37,10 @@
       last_video_frame_format_(VideoFrame::UNKNOWN),
       hardware_config_(AudioParameters(), AudioParameters()) {
   base::MD5Init(&md5_context_);
+
+  // Prevent non-deterministic buffering state callbacks from firing (e.g., slow
+  // machine, valgrind).
+  pipeline_->set_underflow_disabled_for_testing(true);
 }
 
 PipelineIntegrationTestBase::~PipelineIntegrationTestBase() {
@@ -129,6 +132,10 @@
                                         kTestType test_type) {
   hashing_enabled_ = test_type == kHashed;
   clockless_playback_ = test_type == kClockless;
+  if (clockless_playback_) {
+    pipeline_->SetTimeDeltaInterpolatorForTesting(
+        new TimeDeltaInterpolator(&dummy_clock_));
+  }
   return Start(file_path, expected_status);
 }
 
@@ -249,7 +256,7 @@
       new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));
 
   // Disable frame dropping if hashing is enabled.
-  scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
+  scoped_ptr<VideoRenderer> renderer(new VideoRendererImpl(
       message_loop_.message_loop_proxy(),
       video_decoders.Pass(),
       base::Bind(&PipelineIntegrationTestBase::SetDecryptor,
@@ -258,6 +265,7 @@
       base::Bind(&PipelineIntegrationTestBase::OnVideoRendererPaint,
                  base::Unretained(this)),
       false));
+  collection->SetVideoRenderer(renderer.Pass());
 
   if (!clockless_playback_) {
     audio_sink_ = new NullAudioSink(message_loop_.message_loop_proxy());
@@ -278,7 +286,7 @@
                              512);
   hardware_config_.UpdateOutputConfig(out_params);
 
-  scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
+  AudioRendererImpl* audio_renderer_impl = new AudioRendererImpl(
       message_loop_.message_loop_proxy(),
       (clockless_playback_)
           ? static_cast<AudioRendererSink*>(clockless_audio_sink_.get())
@@ -287,26 +295,11 @@
       base::Bind(&PipelineIntegrationTestBase::SetDecryptor,
                  base::Unretained(this),
                  decryptor),
-      &hardware_config_));
+      &hardware_config_);
   if (hashing_enabled_)
     audio_sink_->StartAudioHashForTesting();
-
-  scoped_ptr<RendererImpl> renderer_impl(
-      new RendererImpl(message_loop_.message_loop_proxy(),
-                       demuxer_.get(),
-                       audio_renderer.Pass(),
-                       video_renderer.Pass()));
-
-  // Prevent non-deterministic buffering state callbacks from firing (e.g., slow
-  // machine, valgrind).
-  renderer_impl->DisableUnderflowForTesting();
-
-  if (clockless_playback_) {
-    renderer_impl->SetTimeDeltaInterpolatorForTesting(
-        new TimeDeltaInterpolator(&dummy_clock_));
-  }
-
-  collection->SetRenderer(renderer_impl.PassAs<Renderer>());
+  scoped_ptr<AudioRenderer> audio_renderer(audio_renderer_impl);
+  collection->SetAudioRenderer(audio_renderer.Pass());
 
   return collection.Pass();
 }