Allow suspension prior to reaching kHaveFutureData.

media/blink/webmediaplayer_impl_unittest.cc

Index: media/blink/webmediaplayer_impl_unittest.cc
diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc
index b71141d6a085156e4fad24cca3201d7743d9e68e..d7d75bc46e6a116f8f07dc18f2356062c76387be 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -152,6 +152,12 @@ class WebMediaPlayerImplTest : public testing::Test {
     wmpi_->SetReadyState(state);
   }
 
+  void SetPlaybackState(bool is_paused) {
+    wmpi_->client_playback_state_ =
+        is_paused ? blink::WebMediaPlayer::PlaybackState::Paused
+                  : blink::WebMediaPlayer::PlaybackState::Playing;
+  }
+
   void SetPaused(bool is_paused) { wmpi_->paused_ = is_paused; }
   void SetSeeking(bool is_seeking) { wmpi_->seeking_ = is_seeking; }
   void SetEnded(bool is_ended) { wmpi_->ended_ = is_ended; }
@@ -237,7 +243,7 @@ class WebMediaPlayerImplTest : public testing::Test {
   // may want a mock or intelligent fake.
   DummyWebMediaPlayerClient client_;
 
-  MockWebMediaPlayerDelegate delegate_;
+  testing::NiceMock<MockWebMediaPlayerDelegate> delegate_;
 
   // The WebMediaPlayerImpl instance under test.
   std::unique_ptr<WebMediaPlayerImpl> wmpi_;
@@ -259,7 +265,7 @@ TEST_F(WebMediaPlayerImplTest, ComputePlayState_AfterConstruction) {
   state = ComputeBackgroundedPlayState();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
   EXPECT_FALSE(state.is_memory_reporting_enabled);
-  EXPECT_FALSE(state.is_suspended);
+  EXPECT_TRUE(state.is_suspended);
 
   state = ComputeMustSuspendPlayState();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
@@ -297,6 +303,7 @@ TEST_F(WebMediaPlayerImplTest, ComputePlayState_AfterMetadata_AudioOnly) {
   EXPECT_FALSE(state.is_suspended);
 
   SetPaused(false);
+  SetPlaybackState(false);
   state = ComputeBackgroundedPlayState();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
   EXPECT_FALSE(state.is_memory_reporting_enabled);
@@ -473,15 +480,23 @@ TEST_F(WebMediaPlayerImplTest, ComputePlayState_Suspended) {
   WebMediaPlayerImpl::PlayState state;
   SetMetadata(true, true);
 
-  // Suspended players should be resumed unless we have reached the appropriate
-  // ready state and are not seeking.
+  SetPlaybackState(false);
   SetPaused(true);
   state = ComputePlayStateSuspended();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
   EXPECT_FALSE(state.is_memory_reporting_enabled);
   EXPECT_FALSE(state.is_suspended);
 
+  SetPlaybackState(true);
+  state = ComputePlayStateSuspended();
+  EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
+  EXPECT_FALSE(state.is_memory_reporting_enabled);
+  EXPECT_TRUE(state.is_suspended);
+
+  // Suspended players should be resumed unless we have reached the appropriate
+  // ready state and are not seeking.
   SetPaused(false);
+  SetPlaybackState(false);
   state = ComputePlayStateSuspended();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
   EXPECT_FALSE(state.is_memory_reporting_enabled);