backport

- Flush caches on upgrade
- Properly handle FrameModule's unloading
- Use the new module and remove the old implementation

1 files changed, 6 insertions, 4 deletions

diff --git a/js/traffic.js b/js/traffic.js
index 6a6f700..8e408cf 100644
--- a/js/traffic.js
+++ b/js/traffic.js
@@ -29,6 +29,8 @@
 
 ηMatrix.webRequest = (function() {
 
+    Cu.import('chrome://ematrix/content/lib/UriTools.jsm');
+
     /******************************************************************************/
 
     // Intercept and filter web requests according to white and black lists.
@@ -36,7 +38,7 @@
     var onBeforeRootFrameRequestHandler = function(details) {
         var ηm = ηMatrix;
         var requestURL = details.url;
-        var requestHostname = ηm.URI.hostnameFromURI(requestURL);
+        var requestHostname = UriTools.hostnameFromURI(requestURL);
         var tabId = details.tabId;
 
         ηm.tabContextManager.push(tabId, requestURL);
@@ -76,7 +78,7 @@
 
     var onBeforeRequestHandler = function(details) {
         var ηm = ηMatrix,
-            ηmuri = ηm.URI,
+            ηmuri = UriTools,
             requestURL = details.url,
             requestScheme = ηmuri.schemeFromURI(requestURL);
 
@@ -144,7 +146,7 @@
 
     var onBeforeSendHeadersHandler = function(details) {
         var ηm = ηMatrix,
-            ηmuri = ηm.URI,
+            ηmuri = UriTools,
             requestURL = details.url,
             requestScheme = ηmuri.schemeFromURI(requestURL);
 
@@ -304,7 +306,7 @@
         var csp = [],
             cspReport = [],
             rootHostname = tabContext.rootHostname,
-            requestHostname = ηm.URI.hostnameFromURI(requestURL);
+            requestHostname = UriTools.hostnameFromURI(requestURL);
 
         // Inline script tags.
         if ( ηm.mustAllow(rootHostname, requestHostname, 'script' ) !== true ) {