Revert of media: Introduce Renderer interface and RendererImpl.

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index f60d115cbdfab90116cb9c4ad9f035d38180a7a7..94aac8aa61867888990a4fb193458a68cf75092b 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -30,7 +30,6 @@
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
-#include "media/filters/renderer_impl.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/tools/player_x11/data_source_logger.h"
 
@@ -115,12 +114,13 @@
 
   ScopedVector<media::VideoDecoder> video_decoders;
   video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner));
-  scoped_ptr<media::VideoRenderer> video_renderer(
-      new media::VideoRendererImpl(task_runner,
-                                   video_decoders.Pass(),
-                                   media::SetDecryptorReadyCB(),
-                                   paint_cb,
-                                   true));
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      task_runner,
+      video_decoders.Pass(),
+      media::SetDecryptorReadyCB(),
+      paint_cb,
+      true));
+  collection->SetVideoRenderer(video_renderer.Pass());
 
   ScopedVector<media::AudioDecoder> audio_decoders;
   audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner,
@@ -140,21 +140,16 @@
                                    media::SetDecryptorReadyCB(),
                                    &hardware_config));
 
-  scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
-      task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass()));
-
-  collection->SetRenderer(renderer.Pass());
+  collection->SetAudioRenderer(audio_renderer.Pass());
 
   base::WaitableEvent event(true, false);
   media::PipelineStatus status;
 
-  pipeline->Start(collection.Pass(),
-                  base::Bind(&DoNothing),
-                  base::Bind(&OnStatus),
-                  base::Bind(&SaveStatusAndSignal, &event, &status),
-                  base::Bind(&OnMetadata),
-                  base::Bind(&OnBufferingStateChanged),
-                  base::Bind(&DoNothing));
+  pipeline->Start(
+      collection.Pass(), base::Bind(&DoNothing), base::Bind(&OnStatus),
+      base::Bind(&SaveStatusAndSignal, &event, &status),
+      base::Bind(&OnMetadata), base::Bind(&OnBufferingStateChanged),
+      base::Bind(&DoNothing));
 
   // Wait until the pipeline is fully initialized.
   event.Wait();