Move VideoRenderer out of Filter heirarchy.

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index b1d838f53d36906681218963d239ae983bc66925..e364eda90e8044faa860ae0b3dec34ba096e33fc 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -22,9 +22,8 @@
 #include "media/base/decryptor.h"
 #include "media/base/decryptor_client.h"
 #include "media/base/demuxer.h"
-#include "media/base/filters.h"
 #include "media/base/filter_collection.h"
-#include "media/base/pipeline.h"
+#include "media/base/pipeline_status.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
@@ -54,32 +53,6 @@ class Destroyable : public MockClass {
   DISALLOW_COPY_AND_ASSIGN(Destroyable);
 };
 
-// TODO(scherkus): remove when CompositeFilter is removed, see
-// http://crbug.com/126069
-class MockFilter : public Filter {
- public:
-  MockFilter();
-
-  // Filter implementation.
-  void SetHost(FilterHost* host) OVERRIDE;
-  MOCK_METHOD1(Play, void(const base::Closure& callback));
-  MOCK_METHOD1(Pause, void(const base::Closure& callback));
-  MOCK_METHOD1(Flush, void(const base::Closure& callback));
-  MOCK_METHOD1(Stop, void(const base::Closure& callback));
-  MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
-  MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
-
-  FilterHost* host() { return host_; }
-
- protected:
-  virtual ~MockFilter();
-
- private:
-  FilterHost* host_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockFilter);
-};
-
 class MockDemuxer : public Demuxer {
  public:
   MockDemuxer();
@@ -167,27 +140,24 @@ class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer();
 
-  // Filter implementation.
-  MOCK_METHOD1(SetHost, void(FilterHost* host));
+  // VideoRenderer implementation.
+  MOCK_METHOD9(Initialize, void(const scoped_refptr<VideoDecoder>& decoder,
+                                const PipelineStatusCB& status_cb,
+                                const StatisticsCB& statistics_cb,
+                                const TimeCB& time_cb,
+                                const NaturalSizeChangedCB& size_changed_cb,
+                                const base::Closure& ended_cb,
+                                const PipelineStatusCB& error_cb,
+                                const TimeDeltaCB& get_time_cb,
+                                const TimeDeltaCB& get_duration_cb));
   MOCK_METHOD1(Play, void(const base::Closure& callback));
   MOCK_METHOD1(Pause, void(const base::Closure& callback));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
+  MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
-  MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
-
-  // VideoRenderer implementation.
-  MOCK_METHOD4(Initialize, void(const scoped_refptr<VideoDecoder>& decoder,
-                                const PipelineStatusCB& status_cb,
-                                const StatisticsCB& statistics_cb,
-                                const TimeCB& time_cb));
-
   MOCK_METHOD0(HasEnded, bool());
 
-  // TODO(scherkus): although VideoRendererBase defines this method, this really
-  // shouldn't be here OR should be renamed.
-  MOCK_METHOD1(ConsumeVideoFrame, void(scoped_refptr<VideoFrame> frame));
-
  protected:
   virtual ~MockVideoRenderer();