Revert "Speculative revert by sheriff"

media/base/mock_filters.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 103 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
 };
 
 class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer();
   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));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer);
 };
 
 class MockAudioRenderer : public AudioRenderer {
  public:
@@ skipping 18 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
 };
 
 class MockRenderer : public Renderer {
  public:
   MockRenderer();
   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));
   MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD1(SetVolume, void(float volume));
   MOCK_METHOD0(GetMediaTime, base::TimeDelta());
   MOCK_METHOD0(HasAudio, bool());
   MOCK_METHOD0(HasVideo, bool());
@@ skipping 63 matching lines @@
   MOCK_METHOD1(ResetDecoder, void(StreamType stream_type));
   MOCK_METHOD1(DeinitializeDecoder, void(StreamType stream_type));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_