diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /toolkit/components/mozprotocol | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'toolkit/components/mozprotocol')
5 files changed, 1 insertions, 31 deletions
diff --git a/toolkit/components/mozprotocol/moz.build b/toolkit/components/mozprotocol/moz.build index fa09ade5a..42bbeb518 100644 --- a/toolkit/components/mozprotocol/moz.build +++ b/toolkit/components/mozprotocol/moz.build @@ -8,7 +8,3 @@ EXTRA_COMPONENTS += [ 'mozProtocolHandler.js', 'mozProtocolHandler.manifest', ] - -BROWSER_CHROME_MANIFESTS += [ - 'tests/browser.ini' -] diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.js b/toolkit/components/mozprotocol/mozProtocolHandler.js index a92483f6a..97bfb737e 100644 --- a/toolkit/components/mozprotocol/mozProtocolHandler.js +++ b/toolkit/components/mozprotocol/mozProtocolHandler.js @@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); function mozProtocolHandler() { XPCOMUtils.defineLazyPreferenceGetter(this, "urlToLoad", "toolkit.mozprotocol.url", - "https://www.mozilla.org/protocol"); + "http://thereisonlyxul.org/"); } mozProtocolHandler.prototype = { diff --git a/toolkit/components/mozprotocol/tests/browser.ini b/toolkit/components/mozprotocol/tests/browser.ini deleted file mode 100644 index 168882a67..000000000 --- a/toolkit/components/mozprotocol/tests/browser.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] - -[browser_mozprotocol.js] -support-files = - mozprotocol.html diff --git a/toolkit/components/mozprotocol/tests/browser_mozprotocol.js b/toolkit/components/mozprotocol/tests/browser_mozprotocol.js deleted file mode 100644 index 795ce8a08..000000000 --- a/toolkit/components/mozprotocol/tests/browser_mozprotocol.js +++ /dev/null @@ -1,14 +0,0 @@ -// Check that entering moz://a into the address bar directs us to a new url -add_task(function*() { - let path = getRootDirectory(gTestPath).substring("chrome://mochitests/content/".length); - yield SpecialPowers.pushPrefEnv({ - set: [["toolkit.mozprotocol.url", `https://example.com/${path}mozprotocol.html`]], - }); - - yield BrowserTestUtils.withNewTab("about:blank", function*() { - gBrowser.loadURI("moz://a"); - yield BrowserTestUtils.waitForLocationChange(gBrowser, - `https://example.com/${path}mozprotocol.html`); - ok(true, "Made it to the expected page"); - }); -}); diff --git a/toolkit/components/mozprotocol/tests/mozprotocol.html b/toolkit/components/mozprotocol/tests/mozprotocol.html deleted file mode 100644 index 3d6549e00..000000000 --- a/toolkit/components/mozprotocol/tests/mozprotocol.html +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE html> - -<html> -<body> -<p><a id="link" href="moz://a">Test</a></p> -</body> -</html> |