| Index: media/base/mock_filters.cc
|
| diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
|
| index 1c783bd55f0319e71b512b83813a27e8bfc1bbd1..3a9d0a7de99dc32e52f25f6832e39fde750e70a6 100644
|
| --- a/media/base/mock_filters.cc
|
| +++ b/media/base/mock_filters.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "media/base/text_track_config.h"
|
|
|
| using ::testing::_;
|
| using ::testing::Invoke;
|
| @@ -14,23 +15,17 @@ using ::testing::Return;
|
|
|
| namespace media {
|
|
|
| -MockPipeline::MockPipeline() {}
|
| +MockPipelineClient::MockPipelineClient() {}
|
| +MockPipelineClient::~MockPipelineClient() {}
|
| +
|
| +MockPipeline::MockPipeline(PipelineClient* client) : Pipeline(client) {}
|
|
|
| MockPipeline::~MockPipeline() {}
|
|
|
| void MockPipeline::Start(Demuxer* demuxer,
|
| scoped_ptr<Renderer> renderer,
|
| - const base::Closure& ended_cb,
|
| - const PipelineStatusCB& error_cb,
|
| - const PipelineStatusCB& seek_cb,
|
| - const PipelineMetadataCB& metadata_cb,
|
| - const BufferingStateCB& buffering_state_cb,
|
| - const base::Closure& duration_change_cb,
|
| - const AddTextTrackCB& add_text_track_cb,
|
| - const base::Closure& waiting_for_decryption_key_cb) {
|
| - Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb,
|
| - buffering_state_cb, duration_change_cb, add_text_track_cb,
|
| - waiting_for_decryption_key_cb);
|
| + const PipelineStatusCB& seek_cb) {
|
| + Start(demuxer, &renderer, seek_cb);
|
| }
|
|
|
| void MockPipeline::Resume(scoped_ptr<Renderer> renderer,
|
|
|