Bug 1851099 - Remove dom.media.mediasession.enabled pref r=alwu,geckoview-reviewers,webidl,smaug,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D187347
2024-11-23 12:51:06 +00:00 · 2023-09-15 18:31:44 +00:00 · 2023-09-15 18:31:44 +00:00 · e93d3dafd9
commit e93d3dafd9
parent 1d467636de
15 changed files with 12 additions and 55 deletions
--- a/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js
+++ b/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js
@ -19,10 +19,7 @@ const videoId = "video";
 */
 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.media.mediasession.enabled", true],
-      ["media.mediacontrol.testingevents.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js
@ -8,10 +8,7 @@ const frame2 = "frame2";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js
@ -11,10 +11,7 @@ const testVideoId = "video";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js
@ -8,10 +8,7 @@ const defaultFaviconName = "defaultFavicon.svg";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js
@ -5,10 +5,7 @@ const testVideoId = "video";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js
@ -7,10 +7,7 @@ const testVideoId = "video";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js
@ -5,10 +5,7 @@ const testVideoId = "video";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js
@ -6,10 +6,7 @@ const sDefaultSupportedKeys = ["focus", "play", "pause", "playpause", "stop"];

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.mediacontrol.testingevents.enabled", true],
-      ["dom.media.mediasession.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js
+++ b/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js
@ -8,10 +8,7 @@ const ACTION = "previoustrack";

 add_task(async function setupTestingPref() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.media.mediasession.enabled", true],
-      ["media.mediacontrol.testingevents.enabled", true],
-    ],
+    set: [["media.mediacontrol.testingevents.enabled", true]],
  });
 });

--- a/dom/media/mediasession/test/test_setactionhandler.html
+++ b/dom/media/mediasession/test/test_setactionhandler.html
@ -23,8 +23,6 @@ const ACTIONS = [
 ];

 (async function testSetActionHandler() {
-  await setupPreference();
-
  for (const action of ACTIONS) {
    info(`Test setActionHandler for '${action}'`);
    generateAction(action);
@ -46,12 +44,6 @@ const ACTIONS = [
  SimpleTest.finish();
 })();

-function setupPreference() {
-  return SpecialPowers.pushPrefEnv({"set": [
-    ["dom.media.mediasession.enabled", true],
-  ]});
-}
-
 function generateAction(action) {
  let details = generateActionDetails(action);
  SpecialPowers.wrap(navigator.mediaSession).notifyHandler(details);
--- a/dom/media/mediasession/test/test_trigger_actionhanlder.html
+++ b/dom/media/mediasession/test/test_trigger_actionhanlder.html
@ -32,7 +32,6 @@ const testCases = [
 SimpleTest.waitForExplicitFinish();

 SpecialPowers.pushPrefEnv({"set": [
-  ["dom.media.mediasession.enabled", true],
  ["media.mediacontrol.testingevents.enabled", true],
 ]}, startTest());

--- a/dom/webidl/MediaSession.webidl
+++ b/dom/webidl/MediaSession.webidl
@ -27,7 +27,7 @@ enum MediaSessionAction {

 callback MediaSessionActionHandler = undefined(MediaSessionActionDetails details);

-[Exposed=Window, Pref="dom.media.mediasession.enabled"]
+[Exposed=Window]
 interface MediaSession {
  attribute MediaMetadata? metadata;

@ -43,7 +43,7 @@ interface MediaSession {
  undefined notifyHandler(MediaSessionActionDetails details);
 };

-[Exposed=Window, Pref="dom.media.mediasession.enabled"]
+[Exposed=Window]
 interface MediaMetadata {
  [Throws]
  constructor(optional MediaMetadataInit init = {});
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@ -334,7 +334,7 @@ dictionary ShareData {
 // https://w3c.github.io/mediasession/#idl-index
 [Exposed=Window]
 partial interface Navigator {
-  [Pref="dom.media.mediasession.enabled", SameObject]
+  [SameObject]
  readonly attribute MediaSession mediaSession;
 };

--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
@ -68,7 +68,6 @@ class MediaSessionTest : BaseSessionTest() {
        sessionRule.setPrefsUntilTestEnd(
            mapOf(
                "media.mediacontrol.stopcontrol.aftermediaends" to false,
-                "dom.media.mediasession.enabled" to true,
            ),
        )
    }
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@ -3078,12 +3078,6 @@
  value: true
  mirror: always

-# Media Session API
- name: dom.media.mediasession.enabled
-  type: bool
-  value: true
-  mirror: always
-
 # WebCodecs API
 - name: dom.media.webcodecs.enabled
  type: RelaxedAtomicBool