Add browser test for entering PiP while paused

Follow up on
https://chromium-review.googlesource.com/c/chromium/src/+/2387643 by
adding a browser test in addition to the unit test.

Bug: 1139869
Change-Id: I12514d03216e559ec4449105ac78ebb30c4da1e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2484793
Commit-Queue: Wojciech Dzierżanowski <wdzierzanowski@opera.com>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824357}

content/browser/picture_in_picture/picture_in_picture_content_browsertest.cc

@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "content/browser/picture_in_picture/picture_in_picture_service_impl.h"
 #include "content/browser/picture_in_picture/picture_in_picture_window_controller_impl.h"
 #include "content/public/browser/content_browser_client.h"
@@ -14,6 +16,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/dns/mock_host_resolver.h"
+#include "services/media_session/public/cpp/features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/blink/public/mojom/picture_in_picture/picture_in_picture.mojom.h"
 
@@ -39,7 +42,9 @@ class TestOverlayWindow : public OverlayWindow {
   void UpdateVideoSize(const gfx::Size& natural_size) override {
     size_ = natural_size;
   }
-  void SetPlaybackState(PlaybackState playback_state) override {}
+  void SetPlaybackState(PlaybackState playback_state) override {
+    playback_state_ = playback_state;
+  }
   void SetPlayPauseButtonVisibility(bool is_visible) override {}
   void SetSkipAdButtonVisibility(bool is_visible) override {}
   void SetNextTrackButtonVisibility(bool is_visible) override {}
@@ -47,8 +52,13 @@ class TestOverlayWindow : public OverlayWindow {
   void SetSurfaceId(const viz::SurfaceId& surface_id) override {}
   cc::Layer* GetLayerForTesting() override { return nullptr; }
 
+  const base::Optional<PlaybackState>& playback_state() const {
+    return playback_state_;
+  }
+
  private:
   gfx::Size size_;
+  base::Optional<PlaybackState> playback_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestOverlayWindow);
 };
@@ -126,6 +136,11 @@ class PictureInPictureContentBrowserTest : public ContentBrowserTest {
         shell()->web_contents());
   }
 
+  TestOverlayWindow* overlay_window() {
+    return static_cast<TestOverlayWindow*>(
+        window_controller()->GetWindowForTesting());
+  }
+
  private:
   std::unique_ptr<TestWebContentsDelegate> web_contents_delegate_;
   ContentBrowserClient* old_browser_client_ = nullptr;
@@ -239,6 +254,120 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureContentBrowserTest,
   Mock::VerifyAndClearExpectations(web_contents_delegate());
 }
 
+// Check that the playback state in the Picture-in-Picture window follows the
+// state of the media player.
+IN_PROC_BROWSER_TEST_F(PictureInPictureContentBrowserTest,
+                       EnterPictureInPictureForPausedPlayer) {
+  ASSERT_TRUE(NavigateToURL(
+      shell(), GetTestUrl("media/picture_in_picture", "one-video.html")));
+
+  // Play and pause the player from script.
+  bool result = false;
+  ASSERT_TRUE(
+      ExecuteScriptAndExtractBool(shell()->web_contents(), "play();", &result));
+  ASSERT_TRUE(result);
+
+  ASSERT_TRUE(ExecuteScript(shell()->web_contents(), "video.pause();"));
+
+  ASSERT_TRUE(ExecuteScriptAndExtractBool(shell()->web_contents(),
+                                          "enterPictureInPicture();", &result));
+  ASSERT_TRUE(result);
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPaused);
+
+  // Simulate resuming playback by interacting with the PiP window.
+  ASSERT_TRUE(
+      ExecuteScript(shell()->web_contents(), "addPlayEventListener();"));
+  window_controller()->TogglePlayPause();
+
+  base::string16 expected_title = base::ASCIIToUTF16("play");
+  EXPECT_EQ(
+      expected_title,
+      TitleWatcher(shell()->web_contents(), expected_title).WaitAndGetTitle());
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPlaying);
+
+  // Simulate pausing playback by interacting with the PiP window.
+  ASSERT_TRUE(
+      ExecuteScript(shell()->web_contents(), "addPauseEventListener();"));
+  window_controller()->TogglePlayPause();
+
+  expected_title = base::ASCIIToUTF16("pause");
+  EXPECT_EQ(
+      expected_title,
+      TitleWatcher(shell()->web_contents(), expected_title).WaitAndGetTitle());
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPaused);
+}
+
+class MediaSessionPictureInPictureContentBrowserTest
+    : public PictureInPictureContentBrowserTest {
+ public:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    ContentBrowserTest::SetUpCommandLine(command_line);
+
+    command_line->AppendSwitchASCII(switches::kEnableBlinkFeatures,
+                                    "PictureInPictureAPI,MediaSession");
+    scoped_feature_list_.InitWithFeatures(
+        {media_session::features::kMediaSessionService}, {});
+  }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
+// Check that the playback state in the Picture-in-Picture window follows the
+// state of the media player.
+IN_PROC_BROWSER_TEST_F(MediaSessionPictureInPictureContentBrowserTest,
+                       EnterPictureInPictureForPausedPlayer) {
+  ASSERT_TRUE(NavigateToURL(
+      shell(), GetTestUrl("media/picture_in_picture", "one-video.html")));
+
+  // Play and pause the player from script.
+  bool result = false;
+  ASSERT_TRUE(
+      ExecuteScriptAndExtractBool(shell()->web_contents(), "play();", &result));
+  ASSERT_TRUE(result);
+
+  ASSERT_TRUE(ExecuteScript(shell()->web_contents(), "video.pause();"));
+
+  ASSERT_TRUE(ExecuteScriptAndExtractBool(shell()->web_contents(),
+                                          "enterPictureInPicture();", &result));
+  ASSERT_TRUE(result);
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPaused);
+
+  // Simulate resuming playback by invoking the Media Session "play" action
+  // through interaction with the PiP window.
+  ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
+                            "setMediaSessionPlayActionHandler();"));
+  ASSERT_TRUE(
+      ExecuteScript(shell()->web_contents(), "addPlayEventListener();"));
+  window_controller()->TogglePlayPause();
+
+  base::string16 expected_title = base::ASCIIToUTF16("play");
+  EXPECT_EQ(
+      expected_title,
+      TitleWatcher(shell()->web_contents(), expected_title).WaitAndGetTitle());
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPlaying);
+
+  // Simulate pausing playback by invoking the Media Session "pause" action
+  // through interaction with the PiP window.
+  ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
+                            "setMediaSessionPauseActionHandler();"));
+  ASSERT_TRUE(
+      ExecuteScript(shell()->web_contents(), "addPauseEventListener();"));
+  window_controller()->TogglePlayPause();
+
+  expected_title = base::ASCIIToUTF16("pause");
+  EXPECT_EQ(
+      expected_title,
+      TitleWatcher(shell()->web_contents(), expected_title).WaitAndGetTitle());
+  EXPECT_EQ(overlay_window()->playback_state(),
+            OverlayWindow::PlaybackState::kPaused);
+}
+
 class AutoPictureInPictureContentBrowserTest
     : public PictureInPictureContentBrowserTest {
  public:
@@ -255,7 +384,7 @@ class AutoPictureInPictureContentBrowserTest
 // triggered.
 IN_PROC_BROWSER_TEST_F(AutoPictureInPictureContentBrowserTest,
                        AutoPictureInPictureTriggeredWhenFullscreen) {
-  EXPECT_TRUE(NavigateToURL(
+  ASSERT_TRUE(NavigateToURL(
       shell(), GetTestUrl("media/picture_in_picture", "one-video.html")));
 
   bool result = false;

content/test/data/media/picture_in_picture/one-video.html

@@ -22,10 +22,40 @@
           .catch(e => window.domAutomationController.send(false));
     }
 
+    function enterPictureInPicture() {
+      video.requestPictureInPicture()
+          .then(_ => window.domAutomationController.send(true))
+          .catch(e => window.domAutomationController.send(false));
+    }
+
     function enterFullscreen() {
       video.requestFullscreen()
           .then(_ => window.domAutomationController.send(true))
           .catch(e => window.domAutomationController.send(false));
     }
+
+    function addPlayEventListener() {
+      video.addEventListener('play', () => {
+        document.title = 'play';
+      }, { once: true });
+    }
+
+    function addPauseEventListener() {
+      video.addEventListener('pause', () => {
+        document.title = 'pause';
+      }, { once: true });
+    }
+
+    function setMediaSessionPlayActionHandler() {
+      navigator.mediaSession.setActionHandler("play", _ => {
+        video.play();
+      });
+    }
+
+    function setMediaSessionPauseActionHandler() {
+      navigator.mediaSession.setActionHandler("pause", _ => {
+        video.pause();
+      });
+    }
   </script>
 </html>