Media Remoting: Switch to remoting only when media is playing.

media/remoting/remoting_renderer_controller_unittest.cc

Index: media/remoting/remoting_renderer_controller_unittest.cc
diff --git a/media/remoting/remoting_renderer_controller_unittest.cc b/media/remoting/remoting_renderer_controller_unittest.cc
index b22e67d7c941612d12179ad97395db24e1932a1a..23a052ffcea8424a067ec713e2cfd0fa66ad486c 100644
--- a/media/remoting/remoting_renderer_controller_unittest.cc
+++ b/media/remoting/remoting_renderer_controller_unittest.cc
@@ -90,6 +90,9 @@ TEST_F(RemotingRendererControllerTest, ToggleRendererOnFullscreenChange) {
   EXPECT_FALSE(is_rendering_remotely_);
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
   EXPECT_TRUE(is_rendering_remotely_);  // All requirements now satisfied.
 
   // Leaving fullscreen should shut down remoting.
@@ -114,6 +117,9 @@ TEST_F(RemotingRendererControllerTest, ToggleRendererOnSinkCapabilities) {
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
   remoting_renderer_controller_->OnEnteredFullscreen();
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
@@ -159,6 +165,9 @@ TEST_F(RemotingRendererControllerTest, ToggleRendererOnDisableChange) {
   EXPECT_FALSE(is_rendering_remotely_);
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
   EXPECT_TRUE(is_rendering_remotely_);  // All requirements now satisfied.
 
   // If the page disables remote playback (e.g., by setting the
@@ -190,6 +199,9 @@ TEST_F(RemotingRendererControllerTest, StartFailed) {
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
 }
 
 TEST_F(RemotingRendererControllerTest, EncryptedWithRemotingCdm) {
@@ -202,6 +214,7 @@ TEST_F(RemotingRendererControllerTest, EncryptedWithRemotingCdm) {
   EXPECT_FALSE(is_rendering_remotely_);
   remoting_renderer_controller_->OnMetadataChanged(EncryptedMetadata());
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
+  remoting_renderer_controller_->OnPlaying();
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
   scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
@@ -267,6 +280,9 @@ TEST_F(RemotingRendererControllerTest, EncryptedWithLocalCdm) {
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
 
   scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
       CreateRemotingSourceImpl(true);
@@ -297,6 +313,9 @@ TEST_F(RemotingRendererControllerTest, EncryptedWithFailedRemotingCdm) {
   remoting_renderer_controller_->OnRemotePlaybackDisabled(false);
   RunUntilIdle();
   EXPECT_FALSE(is_rendering_remotely_);
+  remoting_renderer_controller_->OnPlaying();
+  RunUntilIdle();
+  EXPECT_FALSE(is_rendering_remotely_);
 
   scoped_refptr<RemotingSourceImpl> cdm_remoting_source_impl =
       CreateRemotingSourceImpl(false);