Fix a PIP crash when trying to exit PIP when video is in Auto PIP.

Bug: 1035213
Change-Id: I3da4241c0e97ab3b546ee3cf8b4dc885cc93359d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2369573
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802403}

third_party/blink/renderer/core/html/media/html_video_element.cc

@@ -491,7 +491,8 @@ bool HTMLVideoElement::UsesOverlayFullscreenVideo() const {
 void HTMLVideoElement::DidEnterFullscreen() {
   UpdateControlsVisibility();
 
-  if (DisplayType() == WebMediaPlayer::DisplayType::kPictureInPicture) {
+  if (DisplayType() == WebMediaPlayer::DisplayType::kPictureInPicture &&
+      !IsInAutoPIP()) {
     PictureInPictureController::From(GetDocument())
         .ExitPictureInPicture(this, nullptr);
   }

third_party/blink/renderer/core/html/media/html_video_element_test.cc

@@ -191,4 +191,17 @@ TEST_F(HTMLVideoElementTest, HasAvailableVideoFrameChecksWMP) {
   EXPECT_TRUE(video()->HasAvailableVideoFrame());
 }
 
+TEST_F(HTMLVideoElementTest, AutoPIPExitPIPTest) {
+  video()->SetSrc("http://example.com/foo.mp4");
+  test::RunPendingTasks();
+
+  // Set in auto PIP.
+  video()->OnBecamePersistentVideo(true);
+
+  // Shouldn't get to PictureInPictureController::ExitPictureInPicture
+  // and fail the DCHECK.
+  EXPECT_NO_FATAL_FAILURE(video()->DidEnterFullscreen());
+  test::RunPendingTasks();
+}
+
 }  // namespace blink

third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_controller_impl.cc

@@ -242,6 +242,7 @@ void PictureInPictureControllerImpl::ExitPictureInPicture(
   if (!EnsureService())
     return;
 
+  DCHECK(picture_in_picture_session_.is_bound());
   picture_in_picture_session_->Stop(
       WTF::Bind(&PictureInPictureControllerImpl::OnExitedPictureInPicture,
                 WrapPersistent(this), WrapPersistent(resolver)));