Merge 21999 - BufferedDataSource to support server without range request supp...

media/filters/ffmpeg_demuxer_unittest.cc

Index: media/filters/ffmpeg_demuxer_unittest.cc
===================================================================
--- media/filters/ffmpeg_demuxer_unittest.cc	(revision 22811)
+++ media/filters/ffmpeg_demuxer_unittest.cc	(working copy)
@@ -776,12 +776,14 @@
   EXPECT_EQ(1024, size);
 }
 
-TEST_F(FFmpegDemuxerTest, ProtocolIsStreamed) {
+TEST_F(FFmpegDemuxerTest, ProtocolIsStreaming) {
   {
     SCOPED_TRACE("");
     InitializeDemuxer();
   }
-  EXPECT_FALSE(demuxer_->IsStreamed());
+  EXPECT_CALL(*data_source_, IsStreaming())
+      .WillOnce(Return(false));
+  EXPECT_FALSE(demuxer_->IsStreaming());
 }
 
 }  // namespace media
Property changes on: media\filters\ffmpeg_demuxer_unittest.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/filters/ffmpeg_demuxer_unittest.cc:r21999