Issue 5061 - Update adblockpluscore dependency to 3bdddf0e8343

lib/compat.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 51 matching lines @@
     {
       createInstance() { return new FakeTimer(); }
     },
     "@mozilla.org/xmlextras/xmlhttprequest;1":
     {
       createInstance() { return new XMLHttpRequest(); }
     }
   },
   results: {},
   utils: {
-    import()
+    import(resource)
     {
+      let match = /^resource:\/\/gre\/modules\/(.+)\.jsm$/.exec(resource);
+      let resourceName = match && match[1];
+      if (resourceName && Cu.import.resources.has(resourceName))
+        return {[resourceName]: Cu.import.resources.get(resourceName)};
+
+      throw new Error(
+        "Attempt to import unknown JavaScript module " + resource
+      );
     },
     reportError(e)
     {
       console.error(e);
       console.trace();
     }
   },
   manager: null,
   ID() { return null; }
 };
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-let XPCOMUtils = {
+Cu.import.resources = new Map();
+
+Cu.import.resources.set("XPCOMUtils", {
   generateQI() {}
-};
+});
 
 //
 // Fake nsIFile implementation for our I/O
 //
 
 function FakeFile(path)
 {
   this.path = path;
 }
 FakeFile.prototype =
@@ skipping 18 matching lines @@
   {
     return {create() {}};
   },
   normalize() {}
 };
 
 //
 // Services.jsm module emulation
 //
 
-let Services = {
+Cu.import.resources.set("Services", {
   obs: {
     addObserver() {},
     removeObserver() {}
   },
   vc: {
     compare(v1, v2)
     {
       function parsePart(s)
       {
         if (!s)
@@ skipping 52 matching lines @@
       let parts2 = v2.split(".");
       for (let i = 0; i < Math.max(parts1.length, parts2.length); i++)
       {
         let result = compareParts(parsePart(parts1[i]), parsePart(parts2[i]));
         if (result)
           return result;
       }
       return 0;
     }
   }
-};
+});
 
 //
 // FileUtils.jsm module emulation
 //
 
-let FileUtils = {
+Cu.import.resources.set("FileUtils", {
   PERMS_DIRECTORY: 0
-};
+});
 
 function FakeTimer()
 {
 }
 FakeTimer.prototype =
 {
   delay: 0,
   callback: null,
   initWithCallback(callback, delay)
   {
@@ skipping 26 matching lines @@
   status: -1,
   notificationCallbacks: {},
   loadFlags: 0,
   INHIBIT_CACHING: 0,
   VALIDATE_ALWAYS: 0,
   QueryInterface()
   {
     return this;
   }
 };