Properly handle track status changes in FLUSHED state

media/renderers/renderer_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 972 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(audio_renderer_flush_cb);
 
   // Now, while the RendererImpl::Flush is pending, perform an audio track
   // switch. The handling of the track switch will be postponed until after
   // RendererImpl::Flush completes.
   stream_status_change_cb.Run(audio_stream_.get(), false, base::TimeDelta());
   stream_status_change_cb.Run(secondary_audio_stream.get(), true,
                               base::TimeDelta());
 
-  // After RendererImpl::Flush we expect audio renderer flush to happen again,
-  // due to audio track switch handling. And we expect the audio renderer to be
-  // reinitialized for the secondary_audio_stream.
-  EXPECT_CALL(*audio_renderer_, Flush(_))
-      .WillRepeatedly(DoAll(
-          SetBufferingState(&audio_renderer_client_, BUFFERING_HAVE_NOTHING),
-          RunClosure<0>()));
-  EXPECT_CALL(*audio_renderer_, StartPlaying())
-      .WillRepeatedly(
-          SetBufferingState(&audio_renderer_client_, BUFFERING_HAVE_ENOUGH));
+  // Ensure that audio track switch occurs after Flush by verifying that the
+  // audio renderer is reinitialized with the secondary audio stream.
   EXPECT_CALL(*audio_renderer_,
               Initialize(secondary_audio_stream.get(), _, _, _));
 
   audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   audio_renderer_flush_cb.Run();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, VideoTrackSwitchDuringFlush) {
   CreateAudioAndVideoStream();
@@ skipping 30 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(video_renderer_flush_cb);
 
   // Now, while the RendererImpl::Flush is pending, perform a video track
   // switch. The handling of the track switch will be postponed until after
   // RendererImpl::Flush completes.
   stream_status_change_cb.Run(video_stream_.get(), false, base::TimeDelta());
   stream_status_change_cb.Run(secondary_video_stream.get(), true,
                               base::TimeDelta());
 
-  // After RendererImpl::Flush we expect video renderer flush to happen again,
-  // due to video track switch handling. And we expect the video renderer to be
-  // reinitialized for the video.
-  EXPECT_CALL(*video_renderer_, Flush(_))
-      .WillRepeatedly(DoAll(
-          SetBufferingState(&video_renderer_client_, BUFFERING_HAVE_NOTHING),
-          RunClosure<0>()));
-  EXPECT_CALL(*video_renderer_, StartPlayingFrom(_))
-      .WillRepeatedly(
-          SetBufferingState(&video_renderer_client_, BUFFERING_HAVE_ENOUGH));
-  EXPECT_CALL(*video_renderer_, OnTimeProgressing())
-      .Times(testing::AnyNumber());
+  // Ensure that video track switch occurs after Flush by verifying that the
+  // video renderer is reinitialized with the secondary video stream.
   EXPECT_CALL(*video_renderer_, OnTimeStopped()).Times(testing::AnyNumber());
   EXPECT_CALL(*video_renderer_,
               Initialize(secondary_video_stream.get(), _, _, _, _));
 
   video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   video_renderer_flush_cb.Run();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace media