1 files changed, 9 insertions, 8 deletions

diff --git a/js/messaging.js b/js/messaging.js
index 3252872..4864e90 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -30,6 +30,8 @@
 
 (function() {
 
+    Cu.import('chrome://ematrix/content/lib/UriTools.jsm');
+
     var ηm = ηMatrix;
 
     /******************************************************************************/
@@ -220,7 +222,6 @@
         r.rows['1st-party'] = new RowSnapshot(r.scope, '1st-party', '1st-party');
         r.rowCount += 1;
 
-        var ηmuri = ηm.URI;
         var reqType, reqHostname, reqDomain;
         var desHostname;
         var row, typeIndex;
@@ -236,7 +237,7 @@
             if ( reqHostname === '' ) {
                 reqHostname = pageStore.pageHostname;
             }
-            reqDomain = ηmuri.domainFromHostname(reqHostname) || reqHostname;
+            reqDomain = UriTools.domainFromHostname(reqHostname) || reqHostname;
 
             // We want rows of self and ancestors
             desHostname = reqHostname;
@@ -404,9 +405,9 @@
     var foundInlineCode = function(tabId, pageStore, details, type) {
         if ( pageStore === null ) { return; }
 
-        var pageHostname = pageStore.pageHostname,
-            ηmuri = ηm.URI.set(details.documentURI),
-            frameURL = ηmuri.normalizedURI();
+        let pageHostname = pageStore.pageHostname;
+        let ηmuri = UriTools.set(details.documentURI);
+        let frameURL = UriTools.normalizedURI();
 
         var blocked = details.blocked;
         if ( blocked === undefined ) {
@@ -433,7 +434,7 @@
 
         var blocked = ηm.mustBlock(
             tabContext.rootHostname,
-            ηm.URI.hostnameFromURI(originURL),
+            UriTools.hostnameFromURI(originURL),
             'cookie'
         );
 
@@ -553,7 +554,7 @@
 
         case 'securityPolicyViolation':
             if ( request.directive === 'worker-src' ) {
-                var url = ηm.URI.hostnameFromURI(request.blockedURI) !== '' ?
+                var url = UriTools.hostnameFromURI(request.blockedURI) !== '' ?
                     request.blockedURI :
                     request.documentURI;
                 if ( pageStore !== null ) {
@@ -716,7 +717,7 @@
     /******************************************************************************/
 
     var prepEntries = function(entries) {
-        var ηmuri = ηm.URI;
+        var ηmuri = UriTools;
         var entry;
         for ( var k in entries ) {
             if ( entries.hasOwnProperty(k) === false ) {