Properly handle track status changes in FLUSHED state

media/renderers/renderer_impl_unittest.cc

Index: media/renderers/renderer_impl_unittest.cc
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index 345287ee168fb7132af76b3995c13c0dc6de9f3f..04740cadbd79eeca02b7e269e1832ae73e0b5aa6 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -990,16 +990,8 @@ TEST_F(RendererImplTest, AudioTrackSwitchDuringFlush) {
   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(), _, _, _));
 
@@ -1050,18 +1042,8 @@ TEST_F(RendererImplTest, VideoTrackSwitchDuringFlush) {
   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(), _, _, _, _));