Bug 1574475 - Fix some failing FTP tests r=necko-reviewers,dragana

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

Author: valenting

browser/components/urlbar/tests/browser/browser_canonizeURL.js

@@ -40,12 +40,6 @@ add_task(async function checkCtrlWorks() {
     ],
   ];
 
-  if (Services.prefs.getBoolPref("network.ftp.enabled")) {
-    // Include FTP testcase only if FTP protocol handler is enabled, otherwise
-    // the test would hang on external application chooser popup.
-    testcases.push(["ftp://example", "ftp://example/", { ctrlKey: true }]);
-  }
-
   // Disable autoFill for this test, since it could mess up the results.
   await SpecialPowers.pushPrefEnv({
     set: [

browser/components/urlbar/tests/unit/test_search_suggestions.js

@@ -1264,61 +1264,7 @@ add_task(async function avoid_remote_url_suggestions_2() {
     ],
   });
 
-  // Check FTP enabled
-  Services.prefs.setBoolPref("network.ftp.enabled", true);
-  registerCleanupFunction(() =>
-    Services.prefs.clearUserPref("network.ftp.enabled")
-  );
-
-  context = createContext("ftp:", { isPrivate: false });
-  await check_results({
-    context,
-    matches: [
-      makeSearchResult(context, {
-        engineName: SUGGESTIONS_ENGINE_NAME,
-        heuristic: true,
-      }),
-    ],
-  });
-
-  context = createContext("ftp:/", { isPrivate: false });
-  await check_results({
-    context,
-    matches: [
-      makeSearchResult(context, {
-        engineName: SUGGESTIONS_ENGINE_NAME,
-        heuristic: true,
-      }),
-    ],
-  });
-
-  context = createContext("ftp://", { isPrivate: false });
-  await check_results({
-    context,
-    matches: [
-      makeSearchResult(context, {
-        engineName: SUGGESTIONS_ENGINE_NAME,
-        heuristic: true,
-      }),
-    ],
-  });
-
-  context = createContext("ftp://test", { isPrivate: false });
-  await check_results({
-    context,
-    matches: [
-      makeVisitResult(context, {
-        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        uri: "ftp://test/",
-        title: "ftp://test/",
-        iconUri: "",
-        heuristic: true,
-      }),
-    ],
-  });
-
   // Check FTP disabled
-  Services.prefs.setBoolPref("network.ftp.enabled", false);
   context = createContext("ftp:", { isPrivate: false });
   await check_results({
     context,

netwerk/test/unit/test_bug826063.js

@@ -9,9 +9,6 @@
 "use strict";
 
 var URIs = ["http://example.org", "https://example.org"];
-if (Services.prefs.getBoolPref("network.ftp.enabled")) {
-  URIs.push("ftp://example.org");
-}
 
 function* getChannels() {
   for (let u of URIs) {

netwerk/test/unit/test_disabled_ftp.js

@@ -428,7 +428,6 @@ skip-if = socketprocess_networking
 run-sequentially = one http2 node proxy is used for all tests, this test is using global session counter
 skip-if = os == "android"
 [test_head_request_no_response_body.js]
-[test_disabled_ftp.js]
 [test_cache_204_response.js]
 [test_http3.js]
 # asan - bug 1616239

netwerk/test/unit/xpcshell.ini

@@ -447,7 +447,6 @@
 add_task(async function test_ftp_protocolHandler() {
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["network.ftp.enabled", false],
       // Disabling the external protocol permission prompt. We don't need it
       // for this test.
       ["security.external_protocol_requires_permission", false],

toolkit/components/extensions/test/mochitest/test_ext_protocolHandlers.html

@@ -119,19 +119,12 @@ add_task(async function test_match_url_filters() {
     // Port filter: standard (implicit) ports.
     { shouldPass, filters: [{ ports: [443] }], url: "https://mozilla.org" },
     { shouldPass, filters: [{ ports: [80] }], url: "http://mozilla.org" },
-    {
-      shouldPass,
-      filters: [{ ports: [21] }],
-      url: "ftp://ftp.mozilla.org",
-      prefs: [["network.ftp.enabled", true]],
-    },
 
     // Port matching unknown protocols will fail.
     {
       shouldFail,
       filters: [{ ports: [21] }],
       url: "ftp://ftp.mozilla.org",
-      prefs: [["network.ftp.enabled", false]],
     },
 
     // Port filter: schemes without a default port.