Bug 1384218 - Follow-up: Fix import URLs in JS Account. r=aceman
authorJorg K <jorgk@jorgk.com>
Thu, 27 Jul 2017 08:18:39 +0200
changeset 28492 cf4f7ca606f3bd8c4f8f7e71887fc8449f25f70d
parent 28491 f4f277cc17496900064876b2564861ae9d3ab293
child 28493 c545cc87e316098a2f25010fd38e15aa632d5f6b
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman
bugs1384218
Bug 1384218 - Follow-up: Fix import URLs in JS Account. r=aceman
mailnews/jsaccount/modules/JaBaseUrl.jsm
mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServer.jsm
mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServerComponent.js
mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolder.jsm
mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolderComponent.js
mailnews/jsaccount/test/unit/resources/testJaFooUrlComponent.js
mailnews/jsaccount/test/unit/test_fooUrl.js
--- a/mailnews/jsaccount/modules/JaBaseUrl.jsm
+++ b/mailnews/jsaccount/modules/JaBaseUrl.jsm
@@ -7,17 +7,17 @@
 const EXPORTED_SYMBOLS = ["JaBaseUrlProperties", "JaBaseUrl"];
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
+Cu.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
 
 // A partial JavaScript implementation of the base server methods.
 
 const JaBaseUrlProperties = {
 
   // The CPP object that delgates to CPP or JS.
   baseContractID:     "@mozilla.org/jacppurldelegator;1",
 
--- a/mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServer.jsm
+++ b/mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServer.jsm
@@ -12,17 +12,17 @@
 const EXPORTED_SYMBOLS = ["JaBaseIncomingServerProperties", "JaBaseIncomingServer"];
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
+Cu.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
 
 // A partial JavaScript implementation of the base server methods.
 
 const JaBaseIncomingServerProperties = {
   baseContractID:     "@mozilla.org/jacppincomingserverdelegator;1",
   baseInterfaces:     [ Ci.nsISupports,
                         Ci.nsIMsgIncomingServer,
                         Ci.nsIInterfaceRequestor,
--- a/mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServerComponent.js
+++ b/mailnews/jsaccount/test/unit/resources/testJaBaseIncomingServerComponent.js
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // This file is the component definition for a demo base implementation of a
 // javascript IncomingServer.
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
+Components.utils.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
 Components.utils.import("resource://testing-common/mailnews/testJaBaseIncomingServer.jsm");
 dump("\n\ntestJaBaseIncomingServerComponent.js\n\n");
 
 // Constructor
 function JaBaseIncomingServerConstructor() {
   dump("JaBaseIncomingServerConstructor\n");
 }
 
--- a/mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolder.jsm
+++ b/mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolder.jsm
@@ -12,17 +12,17 @@
 const EXPORTED_SYMBOLS = ["JaBaseMsgFolderProperties", "JaBaseMsgFolder"];
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
+Cu.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
 
 // A partial JavaScript implementation of the base server methods.
 
 const JaBaseMsgFolderProperties = {
   baseContractID:     "@mozilla.org/jacppmsgfolderdelegator;1",
   baseInterfaces:     [ Ci.nsISupports,
                         Ci.nsIMsgFolder,
                         Ci.nsIDBChangeListener,
--- a/mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolderComponent.js
+++ b/mailnews/jsaccount/test/unit/resources/testJaBaseMsgFolderComponent.js
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // This file is the component definition for a demo base implementation of a
 // javascript msgFolder.
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
+Components.utils.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
 Components.utils.import("resource://testing-common/mailnews/testJaBaseMsgFolder.jsm");
 
 // Constructor
 function JaBaseMsgFolderConstructor() {
 }
 
 // Constructor prototype (not instance prototype).
 JaBaseMsgFolderConstructor.prototype = {
--- a/mailnews/jsaccount/test/unit/resources/testJaFooUrlComponent.js
+++ b/mailnews/jsaccount/test/unit/resources/testJaFooUrlComponent.js
@@ -9,18 +9,18 @@
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 var CE = Components.Exception;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/jsaccount/JSAccountUtils.jsm");
-Cu.import("resource://gre/modules/jsaccount/JaBaseUrl.jsm");
+Cu.import("resource:///modules/jsaccount/JSAccountUtils.jsm");
+Cu.import("resource:///modules/jsaccount/JaBaseUrl.jsm");
 
 const ATTACHMENT_QUERY = "part=1.";
 
 var FooUrlProperties = {
   // Extend the base properties.
   __proto__: JaBaseUrlProperties,
 
   contractID: "@mozilla.org/jsaccount/testjafoourl;1",
--- a/mailnews/jsaccount/test/unit/test_fooUrl.js
+++ b/mailnews/jsaccount/test/unit/test_fooUrl.js
@@ -1,16 +1,16 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests of override functionality using a demo "foo" type url.
 
-Cu.import("resource://gre/modules/jsaccount/JaBaseUrl.jsm");
+Cu.import("resource:///modules/jsaccount/JaBaseUrl.jsm");
 
 var extraInterfaces = [
                        Ci.msgIFooUrl,
                       ];
 
 function newURL() {
   return Cc["@mozilla.org/jsaccount/testjafoourl;1"]
            .createInstance(Ci.nsISupports);