commit 7ebfbc347159e2050e74e1f172eae27adfd66699
author Eric Willigers <ericwilligers@chromium.org> Tue Jul 19 02:15:36 2022
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 19 02:15:36 2022
tree 9255efba4b1523d4990d566c34716f9a0cb743ba
parent 07ba69489602f43554c2877b323f009b6b9f7452

Retire flag MediaControlsUseCutOutByDefault

Media Controls - using cut-out by default when available has been
enabled since M85.

Bug: 1077400
Change-Id: I9b1bb83a11a7282b2eb0cc5789cb15b1e1f05d99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3763541
Reviewed-by: David Bokan <bokan@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1025527}

third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate.cc

diff --git a/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate.cc b/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate.cc
index 592c7060..2de7f41a 100644
--- a/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate.cc
+++ b/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate.cc
@@ -63,8 +63,7 @@
 }
 
 void MediaControlsDisplayCutoutDelegate::DidEnterFullscreen() {
-  if (RuntimeEnabledFeatures::MediaControlsUseCutOutByDefaultEnabled())
-    GetDocument().GetViewportData().SetExpandIntoDisplayCutout(true);
+  GetDocument().GetViewportData().SetExpandIntoDisplayCutout(true);
 
   video_element_->addEventListener(event_type_names::kTouchstart, this, true);
   video_element_->addEventListener(event_type_names::kTouchend, this, true);

third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate_test.cc

diff --git a/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate_test.cc b/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate_test.cc
index 85b0877..7048d42 100644
--- a/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate_test.cc
+++ b/third_party/blink/renderer/modules/media_controls/media_controls_display_cutout_delegate_test.cc
@@ -288,11 +288,7 @@
   // Simulate a single touch gesture and make sure it had no effect.
   SimulateEnterFullscreen();
   SimulateSingleTouchGesture();
-  mojom::ViewportFit expected =
-      RuntimeEnabledFeatures::MediaControlsUseCutOutByDefaultEnabled()
-          ? mojom::ViewportFit::kCoverForcedByUserAgent
-          : mojom::ViewportFit::kAuto;
-  EXPECT_EQ(expected, CurrentViewportFit());
+  EXPECT_EQ(mojom::ViewportFit::kCoverForcedByUserAgent, CurrentViewportFit());
 }
 
 TEST_F(MediaControlsDisplayCutoutDelegateTest, TouchCancelShouldClearState) {
@@ -307,11 +303,7 @@
   list = CreateTouchListWithTwoPoints(1, 1, -1, -1);
   SimulateEvent(CreateTouchEventWithList(event_type_names::kTouchcancel, list));
   EXPECT_FALSE(HasGestureState());
-  mojom::ViewportFit expected =
-      RuntimeEnabledFeatures::MediaControlsUseCutOutByDefaultEnabled()
-          ? mojom::ViewportFit::kCoverForcedByUserAgent
-          : mojom::ViewportFit::kAuto;
-  EXPECT_EQ(expected, CurrentViewportFit());
+  EXPECT_EQ(mojom::ViewportFit::kCoverForcedByUserAgent, CurrentViewportFit());
 }
 
 TEST_F(MediaControlsDisplayCutoutDelegateTest, TouchEndShouldClearState) {
@@ -326,26 +318,12 @@
   list = CreateTouchListWithTwoPoints(1, 1, -1, -1);
   SimulateEvent(CreateTouchEventWithList(event_type_names::kTouchend, list));
   EXPECT_FALSE(HasGestureState());
-
-  mojom::ViewportFit expected =
-      RuntimeEnabledFeatures::MediaControlsUseCutOutByDefaultEnabled()
-          ? mojom::ViewportFit::kCoverForcedByUserAgent
-          : mojom::ViewportFit::kAuto;
-  EXPECT_EQ(expected, CurrentViewportFit());
-}
-
-TEST_F(MediaControlsDisplayCutoutDelegateTest, DefaultExpand) {
-  ScopedMediaControlsUseCutOutByDefaultForTest scoped_default_expand(true);
-
-  SimulateEnterFullscreen();
   EXPECT_EQ(mojom::ViewportFit::kCoverForcedByUserAgent, CurrentViewportFit());
 }
 
-TEST_F(MediaControlsDisplayCutoutDelegateTest, DefaultNotExpand) {
-  ScopedMediaControlsUseCutOutByDefaultForTest scoped_default_expand(false);
-
+TEST_F(MediaControlsDisplayCutoutDelegateTest, DefaultExpand) {
   SimulateEnterFullscreen();
-  EXPECT_EQ(mojom::ViewportFit::kAuto, CurrentViewportFit());
+  EXPECT_EQ(mojom::ViewportFit::kCoverForcedByUserAgent, CurrentViewportFit());
 }
 
 }  // namespace blink

third_party/blink/renderer/platform/runtime_enabled_features.json5

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index fcc7e60..8a11278 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1427,10 +1427,6 @@
       status: {"Android": "stable"},
     },
     {
-      name: "MediaControlsUseCutOutByDefault",
-      status: "stable",
-    },
-    {
       name: "MediaElementVolumeGreaterThanOne",
     },
     // Set to reflect the kMediaEngagementBypassAutoplayPolicies feature.