| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index c4249c500632f2d608e9dc0806780cbe27cbac6a..4b603a16367805dd6cdde74835de7eb62c64efd7 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));
|
|
|
| @@ -169,12 +168,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));
|
|
|