| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index e6b153dc802f2f0430c716c0335b338116901c51..c73742a74ac7d8110ff098d4211ad206dcbf6e8e 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -65,7 +65,6 @@ class MockDemuxer : public Demuxer {
|
| MOCK_METHOD0(OnAudioRendererDisabled, void());
|
| MOCK_METHOD1(GetStream, scoped_refptr<DemuxerStream>(DemuxerStream::Type));
|
| MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());
|
| - MOCK_METHOD0(GetBitrate, int());
|
|
|
| protected:
|
| virtual ~MockDemuxer();
|
| @@ -84,7 +83,6 @@ class MockDemuxerStream : public DemuxerStream {
|
| MOCK_METHOD0(audio_decoder_config, const AudioDecoderConfig&());
|
| MOCK_METHOD0(video_decoder_config, const VideoDecoderConfig&());
|
| MOCK_METHOD0(EnableBitstreamConverter, void());
|
| - MOCK_METHOD0(GetBufferedRanges, Ranges<base::TimeDelta>());
|
|
|
| protected:
|
| virtual ~MockDemuxerStream();
|
| @@ -123,7 +121,6 @@ class MockAudioDecoder : public AudioDecoder {
|
| const PipelineStatusCB&,
|
| const StatisticsCB&));
|
| MOCK_METHOD1(Read, void(const ReadCB&));
|
| - MOCK_METHOD1(ProduceAudioSamples, void(scoped_refptr<Buffer>));
|
| MOCK_METHOD0(bits_per_channel, int(void));
|
| MOCK_METHOD0(channel_layout, ChannelLayout(void));
|
| MOCK_METHOD0(samples_per_second, int(void));
|
| @@ -285,12 +282,6 @@ ACTION_P2(SetError, filter, error) {
|
| filter->host()->SetError(error);
|
| }
|
|
|
| -// Helper gmock action that calls SetDuration() on behalf of the provided
|
| -// filter.
|
| -ACTION_P2(SetDuration, filter, duration) {
|
| - filter->host()->SetDuration(duration);
|
| -}
|
| -
|
| ACTION(RunClosure) {
|
| arg0.Run();
|
| }
|
|
|