| Index: media/filters/ffmpeg_demuxer_unittest.cc
|
| diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
|
| index 7c3d37cfecc4d05fa2065e8d31f416a12ee3a7e9..64b0c2983371430740bcc43e83c0227827493c77 100644
|
| --- a/media/filters/ffmpeg_demuxer_unittest.cc
|
| +++ b/media/filters/ffmpeg_demuxer_unittest.cc
|
| @@ -127,17 +127,6 @@ class FFmpegDemuxerTest : public testing::Test {
|
| demuxer_->duration_known_ = duration_known;
|
| }
|
|
|
| - // Creates a data source with the given |file_name|. If |disable_file_size|
|
| - // then the data source pretends it does not know the file size (e.g. often
|
| - // when streaming video). Uses this data source to initialize a demuxer, then
|
| - // returns true if the bitrate is valid, false otherwise.
|
| - bool VideoHasValidBitrate(
|
| - const std::string& file_name, bool disable_file_size) {
|
| - CreateDemuxer(file_name, disable_file_size);
|
| - InitializeDemuxer();
|
| - return demuxer_->GetBitrate() > 0;
|
| - }
|
| -
|
| bool IsStreamStopped(DemuxerStream::Type type) {
|
| DemuxerStream* stream = demuxer_->GetStream(type);
|
| CHECK(stream);
|
| @@ -580,22 +569,6 @@ TEST_F(FFmpegDemuxerTest, ProtocolRead) {
|
| message_loop_.RunAllPending();
|
| }
|
|
|
| -TEST_F(FFmpegDemuxerTest, GetBitrate_SetInContainer) {
|
| - EXPECT_TRUE(VideoHasValidBitrate("bear.ogv", false));
|
| -}
|
| -
|
| -TEST_F(FFmpegDemuxerTest, GetBitrate_UnsetInContainer_KnownSize) {
|
| - EXPECT_TRUE(VideoHasValidBitrate("bear-320x240.webm", false));
|
| -}
|
| -
|
| -TEST_F(FFmpegDemuxerTest, GetBitrate_SetInContainer_NoFileSize) {
|
| - EXPECT_TRUE(VideoHasValidBitrate("bear.ogv", true));
|
| -}
|
| -
|
| -TEST_F(FFmpegDemuxerTest, GetBitrate_UnsetInContainer_NoFileSize) {
|
| - EXPECT_TRUE(VideoHasValidBitrate("bear-320x240.webm", true));
|
| -}
|
| -
|
| TEST_F(FFmpegDemuxerTest, ProtocolGetSetPosition) {
|
| CreateDemuxer("bear-320x240.webm");
|
| InitializeDemuxer();
|
|
|