[Pkg-mozext-commits] [requestpolicy] 04/280: don't use resource://requestpolicy/ anymore

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:29:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit f2d8a5ddc83c6e9cd1a65d3dd1da897a98f4c0fb
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Nov 25 03:53:45 2014 +0100

    don't use resource://requestpolicy/ anymore
    
    instead: chrome://requestpolicy/content/lib/
    JSM modules have been moved to src/content/lib/
---
 src/chrome.manifest                               |  1 -
 src/components/requestpolicyService.js            |  2 +-
 src/content/classicmenu.js                        | 10 ++---
 src/{modules => content/lib}/DomainUtil.jsm       |  2 +-
 src/{modules => content/lib}/FileUtil.jsm         |  2 +-
 src/{modules => content/lib}/GUILocation.jsm      |  2 +-
 src/{modules => content/lib}/JSON.jsm             |  0
 src/{modules => content/lib}/Logger.jsm           |  0
 src/{modules => content/lib}/PolicyManager.jsm    |  8 ++--
 src/{modules => content/lib}/Prompter.jsm         |  0
 src/{modules => content/lib}/Request.jsm          |  6 +--
 src/{modules => content/lib}/RequestProcessor.jsm | 10 ++---
 src/{modules => content/lib}/RequestResult.jsm    |  0
 src/{modules => content/lib}/RequestUtil.jsm      |  6 +--
 src/{modules => content/lib}/Ruleset.jsm          |  4 +-
 src/{modules => content/lib}/RulesetStorage.jsm   |  4 +-
 src/{modules => content/lib}/Services.jsm         |  0
 src/{modules => content/lib}/Subscription.jsm     |  8 ++--
 src/{modules => content/lib}/Util.jsm             |  0
 src/content/menu.js                               | 10 ++---
 src/content/overlay.js                            | 10 ++---
 src/content/requestLog.js                         |  6 +--
 src/content/settings/common.js                    | 10 ++---
 tests/xpcshell/head_loadrp.js                     | 45 +++++++++++++----------
 tests/xpcshell/head_utils.js                      |  2 +-
 tests/xpcshell/test_fileutil.js                   |  2 +-
 tests/xpcshell/test_policymanager.js              |  6 +--
 tests/xpcshell/test_policystorage.js              |  4 +-
 tests/xpcshell/test_subscription.js               |  2 +-
 29 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/src/chrome.manifest b/src/chrome.manifest
index c195a30..d44e6aa 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -1,5 +1,4 @@
 content    requestpolicy    content/
-resource   requestpolicy    modules/
 skin       requestpolicy    classic/1.0    skin/
 
 locale     requestpolicy    en-US          locale/en-US/
diff --git a/src/components/requestpolicyService.js b/src/components/requestpolicyService.js
index 51a2c37..963b9cd 100644
--- a/src/components/requestpolicyService.js
+++ b/src/components/requestpolicyService.js
@@ -662,7 +662,7 @@ RequestPolicyService.prototype = {
     for (var i in modules) {
       filename = modules[i];
       try {
-        Components.utils.import("resource://requestpolicy/" + filename,
+        Components.utils.import("chrome://requestpolicy/content/lib/" + filename,
             rp.mod);
       } catch(e) {
         // Indicate the filename because the exception doesn't have that
diff --git a/src/content/classicmenu.js b/src/content/classicmenu.js
index 0fe5832..fca7c3a 100644
--- a/src/content/classicmenu.js
+++ b/src/content/classicmenu.js
@@ -25,11 +25,11 @@
 //   var rp = {mod : {}};
 // }
 //
-// Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-// Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-// Components.utils.import("resource://requestpolicy/Ruleset.jsm", rp.mod);
-// Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
-// Components.utils.import("resource://requestpolicy/PolicyManager.jsm",
+// Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+// Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+// Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm", rp.mod);
+// Components.utils.import("chrome://requestpolicy/content/lib/RequestUtil.jsm", rp.mod);
+// Components.utils.import("chrome://requestpolicy/content/lib/PolicyManager.jsm",
 //     rp.mod);
 
 requestpolicy.classicmenu = {
diff --git a/src/modules/DomainUtil.jsm b/src/content/lib/DomainUtil.jsm
similarity index 99%
rename from src/modules/DomainUtil.jsm
rename to src/content/lib/DomainUtil.jsm
index cc3e50e..c6d652e 100644
--- a/src/modules/DomainUtil.jsm
+++ b/src/content/lib/DomainUtil.jsm
@@ -37,7 +37,7 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
 
 var DomainUtil = {};
 
diff --git a/src/modules/FileUtil.jsm b/src/content/lib/FileUtil.jsm
similarity index 98%
rename from src/modules/FileUtil.jsm
rename to src/content/lib/FileUtil.jsm
index f6cb6f8..8853ce7 100644
--- a/src/modules/FileUtil.jsm
+++ b/src/content/lib/FileUtil.jsm
@@ -30,7 +30,7 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/Services.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Services.jsm", rp.mod);
 
 const REQUESTPOLICY_DIR = "requestpolicy";
 
diff --git a/src/modules/GUILocation.jsm b/src/content/lib/GUILocation.jsm
similarity index 98%
rename from src/modules/GUILocation.jsm
rename to src/content/lib/GUILocation.jsm
index 59d01a8..39de95f 100644
--- a/src/modules/GUILocation.jsm
+++ b/src/content/lib/GUILocation.jsm
@@ -33,7 +33,7 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/Ruleset.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm", rp.mod);
 
 
 
diff --git a/src/modules/JSON.jsm b/src/content/lib/JSON.jsm
similarity index 100%
rename from src/modules/JSON.jsm
rename to src/content/lib/JSON.jsm
diff --git a/src/modules/Logger.jsm b/src/content/lib/Logger.jsm
similarity index 100%
rename from src/modules/Logger.jsm
rename to src/content/lib/Logger.jsm
diff --git a/src/modules/PolicyManager.jsm b/src/content/lib/PolicyManager.jsm
similarity index 96%
rename from src/modules/PolicyManager.jsm
rename to src/content/lib/PolicyManager.jsm
index 0057594..ec0d267 100644
--- a/src/modules/PolicyManager.jsm
+++ b/src/content/lib/PolicyManager.jsm
@@ -35,10 +35,10 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Ruleset.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RulesetStorage.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RequestResult.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RulesetStorage.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RequestResult.jsm", rp.mod);
 
 
 function dprint(msg) {
diff --git a/src/modules/Prompter.jsm b/src/content/lib/Prompter.jsm
similarity index 100%
rename from src/modules/Prompter.jsm
rename to src/content/lib/Prompter.jsm
diff --git a/src/modules/Request.jsm b/src/content/lib/Request.jsm
similarity index 97%
rename from src/modules/Request.jsm
rename to src/content/lib/Request.jsm
index de4bb29..773947d 100644
--- a/src/modules/Request.jsm
+++ b/src/content/lib/Request.jsm
@@ -40,9 +40,9 @@ const REQUEST_TYPE_REDIRECT = 2;
 if (!rp) {
   var rp = {mod : {}};
 }
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Util.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Util.jsm", rp.mod);
 
 
 
diff --git a/src/modules/RequestProcessor.jsm b/src/content/lib/RequestProcessor.jsm
similarity index 99%
rename from src/modules/RequestProcessor.jsm
rename to src/content/lib/RequestProcessor.jsm
index 5b23f05..0e8a57a 100644
--- a/src/modules/RequestProcessor.jsm
+++ b/src/content/lib/RequestProcessor.jsm
@@ -37,11 +37,11 @@ const CP_MAPPEDDESTINATION = 0x178c40bf;
 if (!rp) {
   var rp = {mod : {}};
 }
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RequestResult.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Request.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RequestResult.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RequestUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Request.jsm", rp.mod);
 
 
 
diff --git a/src/modules/RequestResult.jsm b/src/content/lib/RequestResult.jsm
similarity index 100%
rename from src/modules/RequestResult.jsm
rename to src/content/lib/RequestResult.jsm
diff --git a/src/modules/RequestUtil.jsm b/src/content/lib/RequestUtil.jsm
similarity index 98%
rename from src/modules/RequestUtil.jsm
rename to src/content/lib/RequestUtil.jsm
index 65ddc53..300e5af 100644
--- a/src/modules/RequestUtil.jsm
+++ b/src/content/lib/RequestUtil.jsm
@@ -23,9 +23,9 @@
 
 var EXPORTED_SYMBOLS = ["RequestUtil", "RequestSet"];
 
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm");
-Components.utils.import("resource://requestpolicy/Logger.jsm");
-Components.utils.import("resource://requestpolicy/RequestResult.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/RequestResult.jsm");
 
 function getUriObject(uri) {
   return DomainUtil.getUriObject(uri);
diff --git a/src/modules/Ruleset.jsm b/src/content/lib/Ruleset.jsm
similarity index 99%
rename from src/modules/Ruleset.jsm
rename to src/content/lib/Ruleset.jsm
index f982657..224905c 100644
--- a/src/modules/Ruleset.jsm
+++ b/src/content/lib/Ruleset.jsm
@@ -32,8 +32,8 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
 
 const RULE_ACTION_ALLOW = 1;
 const RULE_ACTION_DENY = 2;
diff --git a/src/modules/RulesetStorage.jsm b/src/content/lib/RulesetStorage.jsm
similarity index 93%
rename from src/modules/RulesetStorage.jsm
rename to src/content/lib/RulesetStorage.jsm
index e4c1ee8..2d9aba2 100644
--- a/src/modules/RulesetStorage.jsm
+++ b/src/content/lib/RulesetStorage.jsm
@@ -28,8 +28,8 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/FileUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Ruleset.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/FileUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm", rp.mod);
 
 var RulesetStorage = {
 
diff --git a/src/modules/Services.jsm b/src/content/lib/Services.jsm
similarity index 100%
rename from src/modules/Services.jsm
rename to src/content/lib/Services.jsm
diff --git a/src/modules/Subscription.jsm b/src/content/lib/Subscription.jsm
similarity index 97%
rename from src/modules/Subscription.jsm
rename to src/content/lib/Subscription.jsm
index b1a3c24..ac63a52 100644
--- a/src/modules/Subscription.jsm
+++ b/src/content/lib/Subscription.jsm
@@ -30,10 +30,10 @@ var EXPORTED_SYMBOLS = [
   "SUBSCRIPTION_REMOVED_TOPIC"
 ];
 
-Components.utils.import("resource://requestpolicy/FileUtil.jsm");
-Components.utils.import("resource://requestpolicy/Logger.jsm");
-Components.utils.import("resource://requestpolicy/Ruleset.jsm");
-Components.utils.import("resource://requestpolicy/RulesetStorage.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/FileUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/RulesetStorage.jsm");
 
 
 const SUBSCRIPTION_UPDATED_TOPIC = 'requestpolicy-subscription-policy-updated';
diff --git a/src/modules/Util.jsm b/src/content/lib/Util.jsm
similarity index 100%
rename from src/modules/Util.jsm
rename to src/content/lib/Util.jsm
diff --git a/src/content/menu.js b/src/content/menu.js
index 2e748f0..538f2c4 100644
--- a/src/content/menu.js
+++ b/src/content/menu.js
@@ -25,11 +25,11 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Ruleset.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/GUILocation.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RequestUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/GUILocation.jsm", rp.mod);
 
 requestpolicy.menu = {
 
diff --git a/src/content/overlay.js b/src/content/overlay.js
index 958d587..5db78f2 100644
--- a/src/content/overlay.js
+++ b/src/content/overlay.js
@@ -28,11 +28,11 @@ if (!requestpolicy) {
   var requestpolicy = {};
 }
 
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/JSON.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Util.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/JSON.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/RequestUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Util.jsm", rp.mod);
 
 /**
  * Provides functionality for the overlay. An instance of this class exists for
diff --git a/src/content/requestLog.js b/src/content/requestLog.js
index 94ef72a..744c8cd 100644
--- a/src/content/requestLog.js
+++ b/src/content/requestLog.js
@@ -25,9 +25,9 @@ if (!rp) {
   var rp = {mod : {}};
 }
 
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Util.jsm", rp.mod);
-Components.utils.import("resource://requestpolicy/Prompter.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Util.jsm", rp.mod);
+Components.utils.import("chrome://requestpolicy/content/lib/Prompter.jsm", rp.mod);
 
 requestpolicy.requestLog = {
 
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index f88cb55..f15ef6a 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -1,8 +1,8 @@
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm");
-Components.utils.import("resource://requestpolicy/Logger.jsm");
-Components.utils.import("resource://requestpolicy/Subscription.jsm");
-Components.utils.import("resource://requestpolicy/Util.jsm");
-Components.utils.import("resource://requestpolicy/PolicyManager.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Subscription.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Util.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/PolicyManager.jsm");
 
 var rpService = Components.classes["@requestpolicy.com/requestpolicy-service;1"]
     .getService().wrappedJSObject;
diff --git a/tests/xpcshell/head_loadrp.js b/tests/xpcshell/head_loadrp.js
index 9a55933..e9e0d72 100644
--- a/tests/xpcshell/head_loadrp.js
+++ b/tests/xpcshell/head_loadrp.js
@@ -2,15 +2,15 @@
 
 // Note: "resource://test" always resolves to the current test folder.
 
-const CC = Components.classes;
-const CI = Components.interfaces;
-const CR = Components.results;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
 
 // Simulate ProfD in xpcshell tests.
 // Modified from http://ehsanakhgari.org/blog/2008-10-17/testing-cache-service
 function setup_profile_dir() {
-  var dirSvc = CC["@mozilla.org/file/directory_service;1"]
-        .getService(CI.nsIProperties);
+  var dirSvc = Cc["@mozilla.org/file/directory_service;1"]
+        .getService(Ci.nsIProperties);
   var provider = {
     getFile: function(prop, persistent) {
       persistent.value = true;
@@ -18,39 +18,39 @@ function setup_profile_dir() {
           prop == "ProfD" ||
           prop == "cachePDir")
         return do_get_profile();
-      throw CR.NS_ERROR_FAILURE;
+      throw Cr.NS_ERROR_FAILURE;
     },
     QueryInterface: function(iid) {
-      if (iid.equals(CI.nsIDirectoryProvider) ||
-          iid.equals(CI.nsISupports)) {
+      if (iid.equals(Ci.nsIDirectoryProvider) ||
+          iid.equals(Ci.nsISupports)) {
         return this;
       }
-      throw CR.NS_ERROR_NO_INTERFACE;
+      throw Cr.NS_ERROR_NO_INTERFACE;
     }
   };
-  dirSvc.QueryInterface(CI.nsIDirectoryService).registerProvider(provider);
+  dirSvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
 }
 
 setup_profile_dir();
 
 // Register components in the "components" subdirectory. The current directory
 // is the tests/xpcshell/ directory.
-let cwd = Components.classes["@mozilla.org/file/directory_service;1"]
-      .getService(Components.interfaces.nsIProperties)
-      .get("CurWorkD", Components.interfaces.nsILocalFile);
+let cwd = Cc["@mozilla.org/file/directory_service;1"]
+      .getService(Ci.nsIProperties)
+      .get("CurWorkD", Ci.nsILocalFile);
 let compDir = cwd.parent.parent.clone();
 compDir.append("src");
 //compDir.append("components");
-Components.manager instanceof Components.interfaces.nsIComponentRegistrar;
+Components.manager instanceof Ci.nsIComponentRegistrar;
 Components.manager.autoRegister(compDir);
 
 // Setup resource://requestpolicy (since chrome.manifest wasn't loaded).
-let ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                          .getService(Components.interfaces.nsIIOService);
+let ioService = Cc["@mozilla.org/network/io-service;1"]
+    .getService(Ci.nsIIOService);
 let resProt = ioService.getProtocolHandler("resource")
-                       .QueryInterface(Components.interfaces.nsIResProtocolHandler);
-let aliasFile = Components.classes["@mozilla.org/file/local;1"]
-                          .createInstance(Components.interfaces.nsILocalFile);
+    .QueryInterface(Ci.nsIResProtocolHandler);
+let aliasFile = Cc["@mozilla.org/file/local;1"]
+    .createInstance(Ci.nsILocalFile);
 let modulesDir = cwd.parent.parent.clone();
 modulesDir.append("src");
 modulesDir.append("modules");
@@ -66,7 +66,12 @@ if (!requestpolicy) {
   };
 }
 
-Components.utils.import("resource://requestpolicy/Logger.jsm");
+//// maybe this needs to be changed to:
+//var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+//    .getService(Ci.mozIJSSubScriptLoader);
+//loader.loadSubScript("chrome://requestpolicy/content/lib/Logger.jsm");
+//// ? -- see https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_bindings/XPConnect/xpcshell/HOWTO
+Components.utils.import("chrome://requestpolicy/content/lib/Logger.jsm");
 Logger.printFunc = function (msg) {
   print(msg.trimRight());
 }
diff --git a/tests/xpcshell/head_utils.js b/tests/xpcshell/head_utils.js
index eea16b0..4a1e662 100644
--- a/tests/xpcshell/head_utils.js
+++ b/tests/xpcshell/head_utils.js
@@ -1,4 +1,4 @@
-Components.utils.import("resource://requestpolicy/FileUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/FileUtil.jsm");
 
 function copyRulesetFileToProfile(filename, destFilename) {
   if (!destFilename) {
diff --git a/tests/xpcshell/test_fileutil.js b/tests/xpcshell/test_fileutil.js
index ce38544..8f0262f 100644
--- a/tests/xpcshell/test_fileutil.js
+++ b/tests/xpcshell/test_fileutil.js
@@ -1,5 +1,5 @@
 
-Components.utils.import("resource://requestpolicy/FileUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/FileUtil.jsm");
 
 function run_test() {
   // Make sure the RP user dir doesn't already exist.
diff --git a/tests/xpcshell/test_policymanager.js b/tests/xpcshell/test_policymanager.js
index 5234c5c..72d1a67 100644
--- a/tests/xpcshell/test_policymanager.js
+++ b/tests/xpcshell/test_policymanager.js
@@ -1,6 +1,6 @@
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm");
-Components.utils.import("resource://requestpolicy/Ruleset.jsm");
-Components.utils.import("resource://requestpolicy/PolicyManager.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/DomainUtil.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/PolicyManager.jsm");
 
 
 var config = {
diff --git a/tests/xpcshell/test_policystorage.js b/tests/xpcshell/test_policystorage.js
index 6f21250..7a2b261 100644
--- a/tests/xpcshell/test_policystorage.js
+++ b/tests/xpcshell/test_policystorage.js
@@ -1,6 +1,6 @@
 
-Components.utils.import("resource://requestpolicy/Ruleset.jsm");
-Components.utils.import("resource://requestpolicy/RulesetStorage.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Ruleset.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/RulesetStorage.jsm");
 
 // We expect JSON data to represent the following data structure.
 var exampleJsonObj = {
diff --git a/tests/xpcshell/test_subscription.js b/tests/xpcshell/test_subscription.js
index d037549..a1627e3 100644
--- a/tests/xpcshell/test_subscription.js
+++ b/tests/xpcshell/test_subscription.js
@@ -1,5 +1,5 @@
 
-Components.utils.import("resource://requestpolicy/Subscription.jsm");
+Components.utils.import("chrome://requestpolicy/content/lib/Subscription.jsm");
 
 function run_test() {
   test_1();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git



More information about the Pkg-mozext-commits mailing list