| Index: media/base/mock_filters.h
|
| ===================================================================
|
| --- media/base/mock_filters.h (revision 113907)
|
| +++ media/base/mock_filters.h (working copy)
|
| @@ -188,7 +188,7 @@
|
|
|
| // VideoDecoder implementation.
|
| MOCK_METHOD3(Initialize, void(DemuxerStream* stream,
|
| - const PipelineStatusCB& callback,
|
| + const base::Closure& callback,
|
| const StatisticsCallback& stats_callback));
|
| MOCK_METHOD1(Read, void(const ReadCB& callback));
|
| MOCK_METHOD0(natural_size, const gfx::Size&());
|
| @@ -322,7 +322,6 @@
|
| void RunFilterCallback(::testing::Unused, const base::Closure& callback);
|
| void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb);
|
| void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb);
|
| -void RunPipelineStatusOKCB(const PipelineStatusCB& cb); // Always PIPELINE_OK.
|
| void RunFilterCallback3(::testing::Unused, const base::Closure& callback,
|
| ::testing::Unused);
|
|
|
|
|
| Property changes on: media/base/mock_filters.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|