Backed out changeset d744fed63a45 (bug 1744243) for causing xpc failu…

…res in test_URIFixup_external_protocol_fallback. CLOSED TREE
dothq · Aug 9, 2022 · 087b91b · 087b91b
1 parent 8efdb3c
commit 087b91b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 127 deletions.
diff --git a/docshell/base/URIFixup.jsm b/docshell/base/URIFixup.jsm
@@ -55,13 +55,6 @@ XPCOMUtils.defineLazyServiceGetter(
   "nsIDNSService"
 );
 
-XPCOMUtils.defineLazyServiceGetter(
-  lazy,
-  "handlerService",
-  "@mozilla.org/uriloader/handler-service;1",
-  "nsIHandlerService"
-);
-
 XPCOMUtils.defineLazyPreferenceGetter(
   lazy,
   "fixupSchemeTypos",
@@ -266,15 +259,7 @@ XPCOMUtils.defineLazyGetter(lazy, "knownSuffixes", () => {
   return suffixes;
 });
 
-function URIFixup() {
-  // There are cases that nsIExternalProtocolService.externalProtocolHandlerExists() does
-  // not work well and returns always true due to flatpak. In this case, in order to
-  // fallback to nsIHandlerService.exits(), we test whether can trust
-  // nsIExternalProtocolService here.
-  this._trustExternalProtocolService = !lazy.externalProtocolService.externalProtocolHandlerExists(
-    `__dummy${Date.now()}__`
-  );
-}
+function URIFixup() {}
 
 URIFixup.prototype = {
   get FIXUP_FLAG_NONE() {
@@ -344,7 +329,7 @@ URIFixup.prototype = {
       scheme &&
       (isCommonProtocol ||
         Services.io.getProtocolHandler(scheme) != lazy.defaultProtocolHandler ||
-        this._isKnownExternalProtocol(scheme));
+        lazy.externalProtocolService.externalProtocolHandlerExists(scheme));
 
     if (
       canHandleProtocol ||
@@ -646,14 +631,6 @@ URIFixup.prototype = {
 
   isDomainKnown,
 
-  _isKnownExternalProtocol(scheme) {
-    return this._trustExternalProtocolService
-      ? lazy.externalProtocolService.externalProtocolHandlerExists(scheme)
-      : lazy.handlerService.exists(
-          lazy.externalProtocolService.getProtocolHandlerInfo(scheme)
-        );
-  },
-
   classID: Components.ID("{c6cf88b7-452e-47eb-bdc9-86e3561648ef}"),
   QueryInterface: ChromeUtils.generateQI(["nsIURIFixup"]),
 };

diff --git a/docshell/test/unit/test_URIFixup_external_protocol_fallback.js b/docshell/test/unit/test_URIFixup_external_protocol_fallback.js
diff --git a/docshell/test/unit/xpcshell.ini b/docshell/test/unit/xpcshell.ini
@@ -10,7 +10,6 @@ support-files =
 [test_browsing_context_structured_clone.js]
 [test_URIFixup.js]
 [test_URIFixup_check_host.js]
-[test_URIFixup_external_protocol_fallback.js]
 [test_URIFixup_forced.js]
 # Disabled for 1563343 -- URI fixup should be done at the app level in GV.
 skip-if = os == 'android'
@@ -25,6 +24,6 @@ skip-if =
 skip-if = true
 [test_privacy_transition.js]
 [test_subframe_stop_after_parent_error.js]
-skip-if =
+skip-if = 
   os == 'android'
   appname == 'thunderbird' # Needs to run without E10s, can't do that.