| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index fde42cc2453fba89bc87e4073e03349d248bd609..c8548b5e1ff42f8d9013fbeb757b7d5292d92116 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -141,8 +141,8 @@
|
| MOCK_METHOD7(Initialize, void(DemuxerStream* stream,
|
| const PipelineStatusCB& init_cb,
|
| const StatisticsCB& statistics_cb,
|
| + const base::Closure& underflow_cb,
|
| const TimeCB& time_cb,
|
| - const BufferingStateCB& buffering_state_cb,
|
| const base::Closure& ended_cb,
|
| const PipelineStatusCB& error_cb));
|
| MOCK_METHOD0(StartRendering, void());
|
| @@ -150,7 +150,7 @@
|
| MOCK_METHOD1(Flush, void(const base::Closure& callback));
|
| MOCK_METHOD1(Stop, void(const base::Closure& callback));
|
| MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
|
| - MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta time));
|
| + MOCK_METHOD2(Preroll, void(base::TimeDelta time, const PipelineStatusCB& cb));
|
| MOCK_METHOD1(SetVolume, void(float volume));
|
| MOCK_METHOD0(ResumeAfterUnderflow, void());
|
|
|
|
|