Bug 1699222 - browserSettings.ftpProtocolEnabled should return false r=mixedpuppy

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

Author: valenting

toolkit/components/extensions/parent/ext-browserSettings.js

@@ -70,15 +70,6 @@ ExtensionPreferencesManager.addSetting("contextMenuShowEvent", {
   },
 });
 
-ExtensionPreferencesManager.addSetting("ftpProtocolEnabled", {
-  permission: "browserSettings",
-  prefNames: ["network.ftp.enabled"],
-
-  setCallback(value) {
-    return { [this.prefNames[0]]: value };
-  },
-});
-
 ExtensionPreferencesManager.addSetting("imageAnimationBehavior", {
   permission: "browserSettings",
   prefNames: ["image.animation_mode"],
@@ -256,7 +247,7 @@ this.browserSettings = class extends ExtensionAPI {
           name: "ftpProtocolEnabled",
           readOnly: true,
           callback() {
-            return Services.prefs.getBoolPref("network.ftp.enabled");
+            return false;
           },
         }),
         homepageOverride: getSettingsAPI({

toolkit/components/extensions/schemas/browser_settings.json

@@ -56,7 +56,8 @@
       },
       "ftpProtocolEnabled": {
         "$ref": "types.Setting",
-        "description": "Returns whether the FTP protocol is enabled. Read-only."
+        "description": "Returns whether the FTP protocol is enabled. Read-only.",
+        "deprecated": "FTP support was removed from Firefox in bug 1574475"
       },
       "homepageOverride": {
         "$ref": "types.Setting",

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

@@ -214,11 +214,14 @@ add_task(async function test_browser_settings() {
     });
   }
 
-  // Bug 1699222 When the pref is removed, the API needs to be updated to always
-  // return false.  At that time it should be deprecated as well.
   extension.sendMessage("get", "ftpProtocolEnabled");
   let data = await extension.awaitMessage("settingData");
-  equal(data.value, Services.prefs.getBoolPref("network.ftp.enabled"));
+  equal(data.value, false);
+  equal(
+    data.levelOfControl,
+    "not_controllable",
+    `ftpProtocolEnabled is not controllable.`
+  );
 
   await testSetting("newTabPosition", "afterCurrent", {
     "browser.tabs.insertRelatedAfterCurrent": false,