Revert "Speculative revert by sheriff"

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 9cbe50ccccc909916c83c04c1bf00184ffa00776..37940e6766e520355ab2b2c683555df43ea43c19 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -121,17 +121,16 @@ class MockVideoRenderer : public VideoRenderer {
   virtual ~MockVideoRenderer();
 
   // VideoRenderer implementation.
-  MOCK_METHOD10(Initialize,
-                void(DemuxerStream* stream,
-                     const PipelineStatusCB& init_cb,
-                     const SetDecryptorReadyCB& set_decryptor_ready_cb,
-                     const StatisticsCB& statistics_cb,
-                     const BufferingStateCB& buffering_state_cb,
-                     const PaintCB& paint_cb,
-                     const base::Closure& ended_cb,
-                     const PipelineStatusCB& error_cb,
-                     const WallClockTimeCB& wall_clock_time_cb,
-                     const base::Closure& waiting_for_decryption_key_cb));
+  MOCK_METHOD9(Initialize,
+               void(DemuxerStream* stream,
+                    const PipelineStatusCB& init_cb,
+                    const SetDecryptorReadyCB& set_decryptor_ready_cb,
+                    const StatisticsCB& statistics_cb,
+                    const BufferingStateCB& buffering_state_cb,
+                    const base::Closure& ended_cb,
+                    const PipelineStatusCB& error_cb,
+                    const WallClockTimeCB& wall_clock_time_cb,
+                    const base::Closure& waiting_for_decryption_key_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta));
   MOCK_METHOD1(OnTimeStateChanged, void(bool));
@@ -170,12 +169,11 @@ class MockRenderer : public Renderer {
   virtual ~MockRenderer();
 
   // Renderer implementation.
-  MOCK_METHOD8(Initialize,
+  MOCK_METHOD7(Initialize,
                void(DemuxerStreamProvider* demuxer_stream_provider,
                     const PipelineStatusCB& init_cb,
                     const StatisticsCB& statistics_cb,
                     const BufferingStateCB& buffering_state_cb,
-                    const PaintCB& paint_cb,
                     const base::Closure& ended_cb,
                     const PipelineStatusCB& error_cb,
                     const base::Closure& waiting_for_decryption_key_cb));