Merge pull request 'Remove mozprotocol handler.' (#1968) from jobbautista9/UXP:mozprotocol-remove into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1968

5 files changed, 0 insertions, 63 deletions

diff --git a/caps/tests/mochitest/browser_checkloaduri.js b/caps/tests/mochitest/browser_checkloaduri.js
index 24a97c1c45..1fac5c97c7 100644
--- a/caps/tests/mochitest/browser_checkloaduri.js
+++ b/caps/tests/mochitest/browser_checkloaduri.js
@@ -58,7 +58,6 @@ const URLs = new Map([
     ["data:text/html,Hi", true, false, true],
     ["view-source:data:text/html,Hi", false, false, true],
     ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
     ["about:test-chrome-privs", false, false, true],
     ["about:test-unknown-unlinkable", false, false, true],
     ["about:test-content-unlinkable", false, false, true],
@@ -80,7 +79,6 @@ const URLs = new Map([
     ["data:text/html,Hi", true, false, true],
     ["view-source:data:text/html,Hi", false, false, true],
     ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
     ["about:test-chrome-privs", false, false, true],
     ["about:test-unknown-unlinkable", false, false, true],
     ["about:test-content-unlinkable", false, false, true],
@@ -102,7 +100,6 @@ const URLs = new Map([
     ["data:text/html,Hi", true, false, true],
     ["view-source:data:text/html,Hi", true, false, true],
     ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
     ["about:test-chrome-privs", false, false, true],
     ["about:test-unknown-unlinkable", false, false, true],
     ["about:test-content-unlinkable", false, false, true],
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index cd80ca1197..759b07e18e 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -33,7 +33,6 @@ DIRS += [
     'lz4',
     'mediasniffer',
     'microformats',
-    'mozprotocol',
     'osfile',
     'parentalcontrols',
     'passwordmgr',
diff --git a/toolkit/components/mozprotocol/moz.build b/toolkit/components/mozprotocol/moz.build
deleted file mode 100644
index b96a64ec2a..0000000000
--- a/toolkit/components/mozprotocol/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'mozProtocolHandler.js',
-    'mozProtocolHandler.manifest',
-]
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.js b/toolkit/components/mozprotocol/mozProtocolHandler.js
deleted file mode 100644
index 97bfb737e4..0000000000
--- a/toolkit/components/mozprotocol/mozProtocolHandler.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/NetUtil.jsm");
-
-function mozProtocolHandler() {
-  XPCOMUtils.defineLazyPreferenceGetter(this, "urlToLoad", "toolkit.mozprotocol.url",
-                                        "http://thereisonlyxul.org/");
-}
-
-mozProtocolHandler.prototype = {
-  scheme: "moz",
-  defaultPort: -1,
-  protocolFlags: Ci.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD,
-
-  newURI(spec, charset, base) {
-    let uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);
-    if (base) {
-      uri.spec = base.resolve(spec);
-    } else {
-      uri.spec = spec;
-    }
-    return uri;
-  },
-
-  newChannel2(uri, loadInfo) {
-    let realURL = NetUtil.newURI(this.urlToLoad);
-    let channel = Services.io.newChannelFromURIWithLoadInfo(realURL, loadInfo)
-    channel.loadFlags |= Ci.nsIChannel.LOAD_REPLACE;
-    return channel;
-  },
-
-  newChannel(uri) {
-    return this.newChannel(uri, null);
-  },
-
-  classID: Components.ID("{47a45e5f-691e-4799-8686-14f8d3fc0f8c}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]),
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([mozProtocolHandler]);
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.manifest b/toolkit/components/mozprotocol/mozProtocolHandler.manifest
deleted file mode 100644
index bbfdf780af..0000000000
--- a/toolkit/components/mozprotocol/mozProtocolHandler.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {47a45e5f-691e-4799-8686-14f8d3fc0f8c} mozProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=moz {47a45e5f-691e-4799-8686-14f8d3fc0f8c}