Move VideoDecoder out of media pipeline.

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 d1a472a5863079cb10f60606bd4a0f9143616bcc..36e8b2c9b233c9b56ff6bfaf3150d6c83153b6eb 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -233,10 +233,10 @@ class MockVideoRenderer : public VideoRenderer {
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // VideoRenderer implementation.
-  MOCK_METHOD4(Initialize, void(VideoDecoder* decoder,
-                                const PipelineStatusCB& callback,
+  MOCK_METHOD4(Initialize, void(const scoped_refptr<VideoDecoder>& decoder,
+                                const PipelineStatusCB& pipeline_status_cb,
                                 const StatisticsCB& statistics_cb,
-                                const VideoTimeCB& time_cb));
+                                const VideoTimeCB& video_time_cb));
 
   MOCK_METHOD0(HasEnded, bool());
 
@@ -263,8 +263,8 @@ class MockAudioRenderer : public AudioRenderer {
 
   // AudioRenderer implementation.
   MOCK_METHOD4(Initialize, void(const scoped_refptr<AudioDecoder>& decoder,
-                                const PipelineStatusCB& init_callback,
-                                const base::Closure& underflow_callback,
+                                const PipelineStatusCB& init_cb,
+                                const base::Closure& underflow_cb,
                                 const AudioTimeCB& time_cb));
   MOCK_METHOD0(HasEnded, bool());
   MOCK_METHOD1(SetVolume, void(float volume));