| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index 6ccbc3262fa95b2f6d705e2d085dfd1b65ae9b2a..b2b12c2e5cd6ae8594288c72533eff204ed4af83 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -211,7 +211,7 @@ class MockAudioDecoder : public AudioDecoder {
|
|
|
| // AudioDecoder implementation.
|
| MOCK_METHOD3(Initialize, void(DemuxerStream* stream,
|
| - const base::Closure& callback,
|
| + const PipelineStatusCB& callback,
|
| const StatisticsCallback& stats_callback));
|
| MOCK_METHOD1(Read, void(const ReadCB& callback));
|
| MOCK_METHOD1(ProduceAudioSamples, void(scoped_refptr<Buffer>));
|
| @@ -238,7 +238,7 @@ class MockVideoRenderer : public VideoRenderer {
|
|
|
| // VideoRenderer implementation.
|
| MOCK_METHOD3(Initialize, void(VideoDecoder* decoder,
|
| - const base::Closure& callback,
|
| + const PipelineStatusCB& callback,
|
| const StatisticsCallback& stats_callback));
|
| MOCK_METHOD0(HasEnded, bool());
|
|
|
| @@ -265,7 +265,7 @@ class MockAudioRenderer : public AudioRenderer {
|
|
|
| // AudioRenderer implementation.
|
| MOCK_METHOD3(Initialize, void(AudioDecoder* decoder,
|
| - const base::Closure& init_callback,
|
| + const PipelineStatusCB& init_callback,
|
| const base::Closure& underflow_callback));
|
| MOCK_METHOD0(HasEnded, bool());
|
| MOCK_METHOD1(SetVolume, void(float volume));
|
| @@ -317,8 +317,8 @@ class MockFilterCollection {
|
| void RunFilterCallback(::testing::Unused, const base::Closure& callback);
|
| void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb);
|
| void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb);
|
| -void RunFilterCallback3(::testing::Unused, const base::Closure& callback,
|
| - ::testing::Unused);
|
| +void RunPipelineStatusCB3(::testing::Unused, const PipelineStatusCB& callback,
|
| + ::testing::Unused);
|
|
|
| // Helper gmock function that immediately executes the Closure on behalf of the
|
| // provided filter. Can be used when mocking the Stop() method.
|
|
|