backport

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

1 files changed, 4 insertions, 1 deletions

diff --git a/js/vapi-net.js b/js/vapi-net.js
index f8d1052..086e596 100644
--- a/js/vapi-net.js
+++ b/js/vapi-net.js
@@ -26,6 +26,8 @@
 /******************************************************************************/
 
 (function () {
+    Cu.import('chrome://ematrix/content/lib/PendingRequests.jsm');
+
     vAPI.net = {};
 
     vAPI.net.registerListeners = function () {
@@ -40,7 +42,8 @@
         let shouldLoadListenerMessageName = location.host + ':shouldLoad';
         let shouldLoadListener = function (e) {
             let details = e.data;
-            let pendingReq = vAPI.httpObserver.createPendingRequest(details.url);
+            let pendingReq =
+                PendingRequestBuffer.createRequest(details.url);
             pendingReq.rawType = details.rawType;
             pendingReq.tabId = vAPI.tabs.manager.tabIdFromTarget(e.target);
         };