| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index 7e2e8f30ad766cf3a2daad7022e13089c51334da..43477f9eb8b8c9a96c95110958acaa217f2d671b 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -116,16 +116,14 @@ class MockVideoRenderer : public VideoRenderer {
|
| virtual ~MockVideoRenderer();
|
|
|
| // VideoRenderer implementation.
|
| - MOCK_METHOD10(Initialize, void(DemuxerStream* stream,
|
| - bool low_delay,
|
| - const PipelineStatusCB& init_cb,
|
| - const StatisticsCB& statistics_cb,
|
| - const TimeCB& time_cb,
|
| - const BufferingStateCB& buffering_state_cb,
|
| - const base::Closure& ended_cb,
|
| - const PipelineStatusCB& error_cb,
|
| - const TimeDeltaCB& get_time_cb,
|
| - const TimeDeltaCB& get_duration_cb));
|
| + MOCK_METHOD8(Initialize, void(DemuxerStream* stream,
|
| + bool low_delay,
|
| + const PipelineStatusCB& init_cb,
|
| + const StatisticsCB& statistics_cb,
|
| + const BufferingStateCB& buffering_state_cb,
|
| + const base::Closure& ended_cb,
|
| + const PipelineStatusCB& error_cb,
|
| + const TimeDeltaCB& get_time_cb));
|
| MOCK_METHOD1(Flush, void(const base::Closure& callback));
|
| MOCK_METHOD0(StartPlaying, void());
|
|
|
| @@ -139,10 +137,9 @@ class MockAudioRenderer : public AudioRenderer {
|
| virtual ~MockAudioRenderer();
|
|
|
| // AudioRenderer implementation.
|
| - MOCK_METHOD7(Initialize, void(DemuxerStream* stream,
|
| + MOCK_METHOD6(Initialize, void(DemuxerStream* stream,
|
| const PipelineStatusCB& init_cb,
|
| const StatisticsCB& statistics_cb,
|
| - const TimeCB& time_cb,
|
| const BufferingStateCB& buffering_state_cb,
|
| const base::Closure& ended_cb,
|
| const PipelineStatusCB& error_cb));
|
| @@ -161,12 +158,11 @@ class MockRenderer : public Renderer {
|
| virtual ~MockRenderer();
|
|
|
| // Renderer implementation.
|
| - MOCK_METHOD6(Initialize, void(const base::Closure& init_cb,
|
| + MOCK_METHOD5(Initialize, void(const base::Closure& init_cb,
|
| const StatisticsCB& statistics_cb,
|
| const base::Closure& ended_cb,
|
| const PipelineStatusCB& error_cb,
|
| - const BufferingStateCB& buffering_state_cb,
|
| - const TimeDeltaCB& get_duration_cb));
|
| + const BufferingStateCB& buffering_state_cb));
|
| MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));
|
| MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp));
|
| MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
|
| @@ -191,6 +187,7 @@ class MockTimeSource : public TimeSource {
|
| MOCK_METHOD1(SetPlaybackRate, void(float));
|
| MOCK_METHOD1(SetMediaTime, void(base::TimeDelta));
|
| MOCK_METHOD0(CurrentMediaTime, base::TimeDelta());
|
| + MOCK_METHOD0(ApproximateCurrentMediaTime, base::TimeDelta());
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MockTimeSource);
|
|
|