Noissue - Remove usage of the deprecated Promises.jsm module.

lib/crawler.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 "use strict";
 
 /**
  * @module crawler
  */
 
 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
-const {Promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
 function abprequire(module)
 {
   let result = {};
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
   return result.exports;
 }
 
 let {RequestNotifier} = abprequire("requestNotifier");
@@ skipping 101 matching lines @@
  *
  * @param {tabbrowser} browser
  *    The tabbed browser to be observed
  * @param {int} timeout
  *    Load timeout in milliseconds
  * @constructor
  */
 function LoadListener(browser, timeout)
 {
   this._browser = browser;
   this._deferred = new Map();

[Wladimir Palant, 2016/09/30 06:08:33]

I would normally ask you to rename this property but this code will be gone soon
anyway...

   this._timeout = timeout;
   browser.addTabsProgressListener(this);
 }
 LoadListener.prototype = {
   /**
    * Returns a promise that will be resolved when the page in the specified tab
    * finishes loading. Loading will be stopped if the timeout is reached.
    *
    * @param {tab} tab
    * @result {Promise}
    */
   waitForLoad: function(tab)
   {
-    let deferred = Promise.defer();
-    this._deferred.set(tab.linkedBrowser, deferred);
+    return new Promise((resolve, reject) =>
+    {
+      this._deferred.set(tab.linkedBrowser, resolve);
 
-    tab.ownerDocument.defaultView.setTimeout(function()
-    {
-      tab.linkedBrowser.stop();
-    }, this._timeout);
-
-    return deferred.promise;
+      tab.ownerDocument.defaultView.setTimeout(function()
+      {
+        tab.linkedBrowser.stop();
+      }, this._timeout);
+    });
   },
 
   /**
    * Deactivates this object.
    */
   stop: function()
   {
     this._browser.removeTabsProgressListener(this);
   },
 
   onStateChange: function(browser, progress, request, flags, status)
   {
     if ((flags & Ci.nsIWebProgressListener.STATE_STOP) && (flags & Ci.nsIWebProgressListener.STATE_IS_WINDOW))
     {
-      let deferred = this._deferred.get(browser);
-      if (deferred)
+      let resolve = this._deferred.get(browser);
+      if (resolve)
       {
         this._deferred.delete(browser);
 
         let headers = [];
         if (request instanceof Ci.nsIHttpChannel)
         {
           try
           {
             headers.push("HTTP/x.x " + request.responseStatus + " " + request.responseStatusText);
             request.visitResponseHeaders((header, value) => headers.push(header + ": " + value));
           }
           catch (e)
           {
             // Exceptions are expected here
           }
         }
-        deferred.resolve([status, headers]);
+        resolve([status, headers]);
       }
     }
   }
 };
 
 /**
  * Once created, this object will make sure all new windows are dismissed
  * immediately.
  *
  * @constructor
@@ skipping 193 matching lines @@
 
 function reportException(e)
 {
   let stack = "";
   if (e && typeof e == "object" && "stack" in e)
     stack = e.stack + "\n";
 
   Cu.reportError(e);
   dump(e + "\n" + stack + "\n");
 }