Reland r210741 "Separate DemuxerStream and VideoDecoder."

media/filters/video_frame_stream_unittest.cc

Index: media/filters/video_frame_stream_unittest.cc
diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc
index a67c9f33fa6e33de53a498cc4b8d5c12077241c9..37c19bccc878fbe31b9b28e0eb830053490299af 100644
--- a/media/filters/video_frame_stream_unittest.cc
+++ b/media/filters/video_frame_stream_unittest.cc
@@ -300,6 +300,8 @@ TEST_P(VideoFrameStreamTest, Read_AfterReset) {
   ReadFrame();
 }
 
+// No Reset() before initialization is successfully completed.
+
 TEST_P(VideoFrameStreamTest, Reset_AfterInitialization) {
   Initialize();
   Reset();
@@ -314,9 +316,18 @@ TEST_P(VideoFrameStreamTest, Reset_DuringReinitialization) {
   video_frame_stream_->Reset(
       base::Bind(&VideoFrameStreamTest::OnReset, base::Unretained(this)));
   SatisfyPendingCallback(DECODER_REINIT);
+  ReadFrame();
 }
 
-TEST_P(VideoFrameStreamTest, Reset_DuringNormalDemuxerRead) {
+TEST_P(VideoFrameStreamTest, Reset_AfterReinitialization) {
+  Initialize();
+  EnterPendingState(DECODER_REINIT);
+  SatisfyPendingCallback(DECODER_REINIT);
+  Reset();
+  ReadFrame();
+}
+
+TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_Normal) {
   Initialize();
   EnterPendingState(DEMUXER_READ_NORMAL);
   EnterPendingState(DECODER_RESET);
@@ -325,7 +336,7 @@ TEST_P(VideoFrameStreamTest, Reset_DuringNormalDemuxerRead) {
   ReadFrame();
 }
 
-TEST_P(VideoFrameStreamTest, Reset_DuringConfigChangeDemuxerRead) {
+TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_ConfigChange) {
   Initialize();
   EnterPendingState(DEMUXER_READ_CONFIG_CHANGE);
   EnterPendingState(DECODER_RESET);
@@ -350,7 +361,7 @@ TEST_P(VideoFrameStreamTest, Reset_AfterNormalRead) {
   ReadFrame();
 }
 
-TEST_P(VideoFrameStreamTest, Reset_AfterConfigChangeRead) {
+TEST_P(VideoFrameStreamTest, Reset_AfterDemuxerRead_ConfigChange) {
   Initialize();
   EnterPendingState(DEMUXER_READ_CONFIG_CHANGE);
   SatisfyPendingCallback(DEMUXER_READ_CONFIG_CHANGE);
@@ -385,7 +396,14 @@ TEST_P(VideoFrameStreamTest, Stop_DuringReinitialization) {
   SatisfyPendingCallback(DECODER_STOP);
 }
 
-TEST_P(VideoFrameStreamTest, Stop_DuringNormalDemuxerRead) {
+TEST_P(VideoFrameStreamTest, Stop_AfterReinitialization) {
+  Initialize();
+  EnterPendingState(DECODER_REINIT);
+  SatisfyPendingCallback(DECODER_REINIT);
+  Stop();
+}
+
+TEST_P(VideoFrameStreamTest, Stop_DuringDemuxerRead_Normal) {
   Initialize();
   EnterPendingState(DEMUXER_READ_NORMAL);
   EnterPendingState(DECODER_STOP);
@@ -393,7 +411,7 @@ TEST_P(VideoFrameStreamTest, Stop_DuringNormalDemuxerRead) {
   SatisfyPendingCallback(DECODER_STOP);
 }
 
-TEST_P(VideoFrameStreamTest, Stop_DuringConfigChangeDemuxerRead) {
+TEST_P(VideoFrameStreamTest, Stop_DuringDemuxerRead_ConfigChange) {
   Initialize();
   EnterPendingState(DEMUXER_READ_CONFIG_CHANGE);
   EnterPendingState(DECODER_STOP);