Replace Pipeline::kEnded state and HasEnded() methods with renderer-specific bools.

media/base/pipeline_unittest.cc

Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index bd00361c47959848dbf2c66e8ff21d59480b0ed5..6f1bc1eca51bed2dddb057a16ae2bd166b7f8f8b 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -575,10 +575,8 @@ TEST_F(PipelineTest, DisableAudioRenderer) {
   pipeline_->OnAudioDisabled();
 
   // Verify that ended event is fired when video ends.
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(true));
   EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
-  pipeline_->OnRendererEnded();
+  pipeline_->OnVideoRendererEnded();
 }
 
 TEST_F(PipelineTest, DisableAudioRendererDuringInit) {
@@ -603,10 +601,8 @@ TEST_F(PipelineTest, DisableAudioRendererDuringInit) {
   EXPECT_TRUE(pipeline_->HasVideo());
 
   // Verify that ended event is fired when video ends.
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(true));
   EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
-  pipeline_->OnRendererEnded();
+  pipeline_->OnVideoRendererEnded();
 }
 
 TEST_F(PipelineTest, EndedCallback) {
@@ -623,24 +619,11 @@ TEST_F(PipelineTest, EndedCallback) {
   InitializeVideoRenderer();
   InitializePipeline(PIPELINE_OK);
 
-  // Due to short circuit evaluation we only need to test a subset of cases.
-  InSequence s;
-  EXPECT_CALL(*mocks_->audio_renderer(), HasEnded())
-      .WillOnce(Return(false));
-  pipeline_->OnRendererEnded();
-
-  EXPECT_CALL(*mocks_->audio_renderer(), HasEnded())
-      .WillOnce(Return(true));
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(false));
-  pipeline_->OnRendererEnded();
-
-  EXPECT_CALL(*mocks_->audio_renderer(), HasEnded())
-      .WillOnce(Return(true));
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(true));
+  // The ended callback shouldn't run until both renderers have ended.

[Ami GONE FROM CHROMIUM, 2012/08/08 21:48:26]

Does this test fail if you move the EXPECT_CALL in the line below either up a
line or down a line?

[scherkus (not reviewing), 2012/08/08 22:28:34]

Fails if you move it down a line but not up. Testing that something isn't called
at the right time is typically accomplished by use of InSequence. I prefer not
setting the expectation myself!

I did have to add message loop runs to make sure the ended tasks did get
executed.

+  pipeline_->OnAudioRendererEnded();
+
   EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
-  pipeline_->OnRendererEnded();
+  pipeline_->OnVideoRendererEnded();
 }
 
 // Static function & time variable used to simulate changes in wallclock time.
@@ -688,11 +671,7 @@ TEST_F(PipelineTest, AudioStreamShorterThanVideo) {
   EXPECT_EQ(pipeline_->GetMediaTime().ToInternalValue(), start_time);
 
   // Signal end of audio stream.
-  EXPECT_CALL(*mocks_->audio_renderer(), HasEnded())
-      .WillOnce(Return(true));
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(false));
-  pipeline_->OnRendererEnded();
+  pipeline_->OnAudioRendererEnded();
   message_loop_.RunAllPending();
 
   // Verify that the clock advances.
@@ -702,12 +681,8 @@ TEST_F(PipelineTest, AudioStreamShorterThanVideo) {
   EXPECT_GT(pipeline_->GetMediaTime().ToInternalValue(), start_time);
 
   // Signal end of video stream and make sure OnEnded() callback occurs.
-  EXPECT_CALL(*mocks_->audio_renderer(), HasEnded())
-      .WillOnce(Return(true));
-  EXPECT_CALL(*mocks_->video_renderer(), HasEnded())
-      .WillOnce(Return(true));
   EXPECT_CALL(callbacks_, OnEnded(PIPELINE_OK));
-  pipeline_->OnRendererEnded();
+  pipeline_->OnVideoRendererEnded();
 }
 
 TEST_F(PipelineTest, ErrorDuringSeek) {