diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /media/base/mock_demuxer_host.h | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/base/mock_demuxer_host.h')
| -rw-r--r-- | media/base/mock_demuxer_host.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/base/mock_demuxer_host.h b/media/base/mock_demuxer_host.h index 597c13298c..61761a84b9 100644 --- a/media/base/mock_demuxer_host.h +++ b/media/base/mock_demuxer_host.h @@ -5,9 +5,8 @@ #ifndef MEDIA_BASE_MOCK_DEMUXER_HOST_H_ #define MEDIA_BASE_MOCK_DEMUXER_HOST_H_ -#include <string> - #include "media/base/demuxer.h" +#include "media/base/text_track_config.h" #include "testing/gmock/include/gmock/gmock.h" namespace media { @@ -26,6 +25,9 @@ class MockDemuxerHost : public DemuxerHost { // DemuxerHost implementation. MOCK_METHOD1(OnDemuxerError, void(PipelineStatus error)); MOCK_METHOD1(SetDuration, void(base::TimeDelta duration)); + MOCK_METHOD2(AddTextStream, void(DemuxerStream*, + const TextTrackConfig&)); + MOCK_METHOD1(RemoveTextStream, void(DemuxerStream*)); private: DISALLOW_COPY_AND_ASSIGN(MockDemuxerHost); |