Revert of media: Introduce Renderer interface and RendererImpl.

media/base/filter_collection.h

Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index 33c53ba91ed773a4b3d9e20fddcffa8803c4f711..a0aee76f0b8f92d1eb8268c9aa2ddb608f81f76c 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -10,15 +10,16 @@
 
 namespace media {
 
+class AudioRenderer;
 class Demuxer;
-class Renderer;
 class TextRenderer;
+class VideoRenderer;
 
-// Represents a set of uninitialized demuxer and renderers. Used to start a
-// Pipeline object for media playback.
+// Represents a set of uninitialized demuxer and audio/video decoders and
+// renderers. Used to start a Pipeline object for media playback.
 //
-// TODO(xhwang): Create TextRenderer in Pipeline, pass Demuxer and Renderer to
-// Pipeline, and remove FilterCollection, see http://crbug.com/110800
+// TODO(scherkus): Replace FilterCollection with something sensible, see
+// http://crbug.com/110800
 class MEDIA_EXPORT FilterCollection {
  public:
   FilterCollection();
@@ -27,15 +28,19 @@
   void SetDemuxer(Demuxer* demuxer);
   Demuxer* GetDemuxer();
 
-  void SetRenderer(scoped_ptr<Renderer> renderer);
-  scoped_ptr<Renderer> GetRenderer();
+  void SetAudioRenderer(scoped_ptr<AudioRenderer> audio_renderer);
+  scoped_ptr<AudioRenderer> GetAudioRenderer();
+
+  void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer);
+  scoped_ptr<VideoRenderer> GetVideoRenderer();
 
   void SetTextRenderer(scoped_ptr<TextRenderer> text_renderer);
   scoped_ptr<TextRenderer> GetTextRenderer();
 
  private:
   Demuxer* demuxer_;
-  scoped_ptr<Renderer> renderer_;
+  scoped_ptr<AudioRenderer> audio_renderer_;
+  scoped_ptr<VideoRenderer> video_renderer_;
   scoped_ptr<TextRenderer> text_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(FilterCollection);