Media: Don't suspend streaming media on Desktop.

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 55cf6b02632d03b4b1633e38e754cf0f00ef4d34..022357e9069a2d0c000aa0cd9040ed3bf4618125 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -187,37 +187,43 @@ class WebMediaPlayerImplTest : public testing::Test {
   WebMediaPlayerImpl::PlayState ComputePlayState() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = false;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false, false);
   }
 
   WebMediaPlayerImpl::PlayState ComputePlayStateSuspended() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = false;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, true, false);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, true, false);
   }
 
   WebMediaPlayerImpl::PlayState ComputeBackgroundedPlayState() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = false;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, false, true);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false, true);
   }
 
   WebMediaPlayerImpl::PlayState ComputeIdlePlayState() {
     wmpi_->is_idle_ = true;
     wmpi_->must_suspend_ = false;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false, false);
   }
 
   WebMediaPlayerImpl::PlayState ComputeIdleSuspendedPlayState() {
     wmpi_->is_idle_ = true;
     wmpi_->must_suspend_ = false;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, true, false);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, true, false);
   }
 
   WebMediaPlayerImpl::PlayState ComputeMustSuspendPlayState() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = true;
-    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false);
+    return wmpi_->UpdatePlayState_ComputePlayState(false, false, false, false);
+  }
+
+  WebMediaPlayerImpl::PlayState ComputeStreamingPlayState(bool must_suspend) {
+    wmpi_->is_idle_ = true;
+    wmpi_->must_suspend_ = must_suspend;
+    return wmpi_->UpdatePlayState_ComputePlayState(false, true, false, true);
   }
 
   void SetDelegateState(WebMediaPlayerImpl::DelegateState state) {
@@ -568,6 +574,27 @@ TEST_F(WebMediaPlayerImplTest, ComputePlayState_Ended) {
   EXPECT_TRUE(state.is_suspended);
 }
 
+TEST_F(WebMediaPlayerImplTest, ComputePlayState_Streaming) {
+  InitializeWebMediaPlayerImpl();
+  WebMediaPlayerImpl::PlayState state;
+  SetMetadata(true, true);
+
+  SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
+  SetPaused(true);
+
+  // Streaming media should not suspend, even if paused, idle, and backgrounded.
+  state = ComputeStreamingPlayState(false);
+  EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PAUSED, state.delegate_state);
+  EXPECT_FALSE(state.is_memory_reporting_enabled);
+  EXPECT_FALSE(state.is_suspended);
+
+  // Streaming media should suspend when the tab is closed, regardless.
+  state = ComputeStreamingPlayState(true);
+  EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
+  EXPECT_FALSE(state.is_memory_reporting_enabled);
+  EXPECT_TRUE(state.is_suspended);
+}
+
 TEST_F(WebMediaPlayerImplTest, ComputePlayState_Suspended) {
   InitializeWebMediaPlayerImpl();
   WebMediaPlayerImpl::PlayState state;