Index: media/base/mock_filters.h |
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h |
index 308acc5432389c01ff087884c3f7884d0ea58c20..1b290ab9e1fad02c6c95a8ace84a260bcdce358b 100644 |
--- a/media/base/mock_filters.h |
+++ b/media/base/mock_filters.h |
@@ -118,30 +118,33 @@ |
virtual ~MockVideoRenderer(); |
// VideoRenderer implementation. |
- MOCK_METHOD8(Initialize, void(DemuxerStream* stream, |
- bool low_delay, |
+ 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_METHOD1(Flush, void(const base::Closure& callback)); |
+ MOCK_METHOD0(StartPlaying, void()); |
+ |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer); |
+}; |
+ |
+class MockAudioRenderer : public AudioRenderer { |
+ public: |
+ MockAudioRenderer(); |
+ virtual ~MockAudioRenderer(); |
+ |
+ // AudioRenderer implementation. |
+ MOCK_METHOD7(Initialize, void(DemuxerStream* stream, |
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()); |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer); |
-}; |
- |
-class MockAudioRenderer : public AudioRenderer { |
- public: |
- MockAudioRenderer(); |
- virtual ~MockAudioRenderer(); |
- |
- // AudioRenderer implementation. |
- 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)); |
@@ -160,11 +163,12 @@ |
virtual ~MockRenderer(); |
// Renderer implementation. |
- MOCK_METHOD5(Initialize, void(const base::Closure& init_cb, |
+ MOCK_METHOD6(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 BufferingStateCB& buffering_state_cb, |
+ const TimeDeltaCB& get_duration_cb)); |
MOCK_METHOD1(Flush, void(const base::Closure& flush_cb)); |
MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp)); |
MOCK_METHOD1(SetPlaybackRate, void(float playback_rate)); |
@@ -189,7 +193,6 @@ |
MOCK_METHOD1(SetPlaybackRate, void(float)); |
MOCK_METHOD1(SetMediaTime, void(base::TimeDelta)); |
MOCK_METHOD0(CurrentMediaTime, base::TimeDelta()); |
- MOCK_METHOD0(CurrentMediaTimeForSyncingVideo, base::TimeDelta()); |
private: |
DISALLOW_COPY_AND_ASSIGN(MockTimeSource); |