Bug 1943057 - Remove extensions.userScripts.mv3.enabled pref r=extension-reviewers,robwu

Differential Revision: https://phabricator.services.mozilla.com/D258824

Author: mr-cheffy

modules/libpref/init/all.js

@@ -3136,9 +3136,6 @@ pref("extensions.originControls.grantByDefault", true);
 // unless other process sandboxing and extension remoting prefs are changed.
 pref("extensions.webextensions.protocol.remote", true);
 
-// Enable userScripts API by default.
-pref("extensions.userScripts.mv3.enabled", true);
-
 // Whether or not the installed extensions should be migrated to the storage.local IndexedDB backend.
 pref("extensions.webextensions.ExtensionStorageIDB.enabled", true);
 

toolkit/components/extensions/Extension.sys.mjs

@@ -93,15 +93,6 @@ const lazy = XPCOMUtils.declareLazy({
 
   dnrEnabled: { pref: "extensions.dnr.enabled", default: true },
 
-  // All functionality is gated by the "userScripts" permission, and forgetting
-  // about its existence is enough to hide all userScripts functionality.
-  // MV3 userScripts API in development (bug 1875475), off by default.
-  // Not to be confused with MV2 and extensions.webextensions.userScripts.enabled!
-  userScriptsMV3Enabled: {
-    pref: "extensions.userScripts.mv3.enabled",
-    default: false,
-  },
-
   // This pref modifies behavior for MV2.  MV3 is enabled regardless.
   eventPagesEnabled: { pref: "extensions.eventPages.enabled", default: true },
 
@@ -345,8 +336,6 @@ function classifyPermission(perm, restrictSchemes, isPrivileged) {
     return { invalid: perm, privileged: true };
   } else if (perm.startsWith("declarativeNetRequest") && !lazy.dnrEnabled) {
     return { invalid: perm };
-  } else if (perm === "userScripts" && !lazy.userScriptsMV3Enabled) {
-    return { invalid: perm };
   }
   return { permission: perm };
 }
@@ -2085,12 +2074,6 @@ export class ExtensionData {
       }
 
       const shouldIgnorePermission = (perm, verbose = true) => {
-        if (perm === "userScripts" && !lazy.userScriptsMV3Enabled) {
-          if (verbose) {
-            this.manifestWarning(`Unavailable extension permission: ${perm}`);
-          }
-          return true;
-        }
         if (isMV2 && PERMS_NOT_IN_MV2.has(perm)) {
           if (verbose) {
             this.manifestWarning(

toolkit/components/extensions/test/xpcshell/test_ext_permissions_optional_only.js

@@ -36,9 +36,6 @@ add_setup(async () => {
 
   await AddonTestUtils.promiseStartupManager();
   AddonTestUtils.usePrivilegedSignatures = false;
-
-  // "userScripts" can only be in optional_permissions when supported:
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
 });
 
 // Test that an optional-only permission in the "permissions" array is not

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_availability.js

@@ -45,10 +45,6 @@ async function grantUserScriptsPermission(extensionId) {
   });
 }
 
-add_setup(() => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
-});
-
 // Test that manifest.user_scripts does not expose a userScripts API in MV3.
 add_task(async function legacy_userScripts_unavailable_in_mv3() {
   let extension = ExtensionTestUtils.loadExtension({
@@ -405,92 +401,6 @@ add_task(async function legacy_userScripts_plus_userScripts_permission_mv3() {
   await extension.unload();
 });
 
-async function do_test_userScripts_permission_unavailable(manifest_version) {
-  const extensionId = `@permission_disabled_by_pref_mv${manifest_version}`;
-  await grantUserScriptsPermission(extensionId);
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      browser_specific_settings: { gecko: { id: extensionId } },
-      manifest_version,
-      optional_permissions: ["userScripts"],
-    },
-    background() {
-      browser.test.assertEq(
-        undefined,
-        browser.userScripts,
-        "userScripts API unavailable when off by pref"
-      );
-      browser.test.sendMessage("bg_done");
-    },
-  });
-  await extension.startup();
-  await extension.awaitMessage("bg_done");
-
-  Assert.deepEqual(
-    extension.extension.warnings,
-    ["Reading manifest: Unavailable extension permission: userScripts"],
-    "userScripts permission unavailable when off by pref"
-  );
-
-  await extension.unload();
-}
-
-add_task(
-  { pref_set: [["extensions.userScripts.mv3.enabled", false]] },
-  async function userScripts_permission_disabled_by_pref_mv2() {
-    // The only difference compared to pref on is that the warning is about an
-    // invalid extension permission, instead of requiring MV3.
-    await do_test_userScripts_permission_unavailable(2);
-  }
-);
-
-add_task(
-  { pref_set: [["extensions.userScripts.mv3.enabled", false]] },
-  async function userScripts_permission_disabled_by_pref_mv3() {
-    await do_test_userScripts_permission_unavailable(3);
-  }
-);
-
-add_task(
-  {
-    pref_set: [
-      ["extensions.userScripts.mv3.enabled", false],
-      ["extensions.webextOptionalPermissionPrompts", false],
-      [
-        // This pref controls the Cu.isInAutomation flag that is needed to use
-        // browser.test.withHandlingUserInput in xpcshell tests (bug 1598804):
-        "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer",
-        true,
-      ],
-    ],
-  },
-  async function reject_userScripts_permission_request_when_disabled_by_pref() {
-    let extension = ExtensionTestUtils.loadExtension({
-      manifest: {
-        manifest_version: 3,
-        optional_permissions: ["userScripts"],
-      },
-      async background() {
-        let prom;
-        browser.test.withHandlingUserInput(() => {
-          prom = browser.permissions.request({ permissions: ["userScripts"] });
-        });
-        await browser.test.assertRejects(
-          prom,
-          "Cannot request permission userScripts since it was not declared in optional_permissions",
-          "userScripts permission cannot be requested when off by pref"
-        );
-        browser.test.assertEq(undefined, browser.userScripts, "No API please");
-        browser.test.sendMessage("done");
-      },
-    });
-
-    await extension.startup();
-    await extension.awaitMessage("done");
-    await extension.unload();
-  }
-);
-
 add_task(
   {
     pref_set: [

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_csp.js

@@ -17,8 +17,6 @@ AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();
 
 add_setup(async () => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
-
   // Grant "userScripts" permission via permissions.request() without UI.
   Services.prefs.setBoolPref(
     "extensions.webextOptionalPermissionPrompts",

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_injection.js

@@ -47,7 +47,6 @@ async function collectResults(contentPage) {
 }
 
 add_setup(async () => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
   await ExtensionTestUtils.startAddonManager();
 });
 

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_messaging.js

@@ -28,7 +28,6 @@ async function grantUserScriptsPermission(extensionId) {
 }
 
 add_setup(async () => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
   await ExtensionTestUtils.startAddonManager();
 });
 

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_persistence.js

@@ -38,7 +38,6 @@ function loadTestExtension({ background }) {
 }
 
 add_setup(async () => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
   await ExtensionTestUtils.startAddonManager();
 });
 

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_mv3_worlds.js

@@ -29,7 +29,6 @@ async function spawnPage(spawnFunc) {
 }
 
 add_setup(async () => {
-  Services.prefs.setBoolPref("extensions.userScripts.mv3.enabled", true);
   await ExtensionTestUtils.startAddonManager();
 });
 

toolkit/mozapps/extensions/test/browser/browser_html_detail_permissions_userScripts.js

@@ -13,10 +13,7 @@ AddonTestUtils.initMochitest(this);
 
 add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.userScripts.mv3.enabled", true],
-      ["extensions.dataCollectionPermissions.enabled", true],
-    ],
+    set: [["extensions.dataCollectionPermissions.enabled", true]],
   });
 });