Move VideoDecoder initialization into VideoRendererBase.

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 515cd442e90d568da5296c7ec5b06f226314deef..4a6635d7f398cb8f22b6bee7493f8d26d425ecd9 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -137,15 +137,16 @@ class MockVideoRenderer : public VideoRenderer {
   MockVideoRenderer();
 
   // VideoRenderer implementation.
-  MOCK_METHOD9(Initialize, void(const scoped_refptr<VideoDecoder>& decoder,
-                                const PipelineStatusCB& init_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_METHOD10(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
+                                 const VideoDecoderList& decoders,
+                                 const PipelineStatusCB& init_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));
@@ -153,6 +154,7 @@ class MockVideoRenderer : public VideoRenderer {
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD0(HasEnded, bool());
+  MOCK_METHOD0(PrepareForShutdownHack, void());

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

Do you really need this?

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Yes. It is part of the VideoRenderer interface. :/

 
  protected:
   virtual ~MockVideoRenderer();