| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index aaf6c6a53b94320d5312c575ce6f18a9d815111f..7a0167f8b509b0ac8ec410254a57e251685b7c6b 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -132,7 +132,9 @@ class MockDemuxer : public Demuxer {
|
| MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_METHOD0(AbortPendingReads, void());
|
| - MOCK_METHOD1(GetStream, DemuxerStream*(DemuxerStream::Type));
|
| + MOCK_METHOD0(GetAllStreams, std::vector<DemuxerStream*>());
|
| + MOCK_METHOD1(SetStreamStatusChangeCB, void(const StreamStatusChangeCB& cb));
|
| +
|
| MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());
|
| MOCK_CONST_METHOD0(GetTimelineOffset, base::Time());
|
| MOCK_CONST_METHOD0(GetMemoryUsage, int64_t());
|
| @@ -166,7 +168,6 @@ class MockDemuxerStream : public DemuxerStream {
|
| VideoRotation video_rotation() override;
|
| MOCK_CONST_METHOD0(enabled, bool());
|
| MOCK_METHOD2(set_enabled, void(bool, base::TimeDelta));
|
| - MOCK_METHOD1(SetStreamStatusChangeCB, void(const StreamStatusChangeCB&));
|
|
|
| private:
|
| Type type_;
|
|
|