Issue 3494 - Update buildtools dependency for adblockplus to revision 4d73b9c76e34 (disable E10S co…

lib/child/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 228 matching lines @@
     // Populate types map
     let iface = Ci.nsIContentPolicy;
     for (let name in iface)
       if (name.indexOf("TYPE_") == 0 && name != "TYPE_DATAREQUEST")
         types.set(iface[name], name.substr(5));
 
     let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
     registrar.registerFactory(this.classID, this.classDescription, this.contractID, this);
 
     let catMan = Utils.categoryManager;
-    let addCategoryEntry = Utils.getPropertyWithoutCompatShims(catMan, "addCategoryEntry");
     for (let category of this.xpcom_categories)
-      addCategoryEntry.call(catMan, category, this.contractID, this.contractID, false, true);
+      catMan.addCategoryEntry(category, this.contractID, this.contractID, false, true);
 
-    let addObserver = Utils.getPropertyWithoutCompatShims(Services.obs, "addObserver");
-    addObserver.call(Services.obs, this, "content-document-global-created", true);
+    Services.obs.addObserver(this, "content-document-global-created", true);
 
     onShutdown.add(() =>
     {
-      let removeObserver = Utils.getPropertyWithoutCompatShims(Services.obs, "removeObserver");
-      removeObserver.call(Services.obs, this, "content-document-global-created");
+      Services.obs.removeObserver(this, "content-document-global-created");
 
       for (let category of this.xpcom_categories)
         catMan.deleteCategoryEntry(category, this.contractID, false);
 
       registrar.unregisterFactory(this.classID, this);
     });
   },
 
   //
   // nsISupports interface implementation
@@ skipping 196 matching lines @@
         let property = (hasCols ? "cols" : "rows");
         let weights = parentNode[property].split(",");
         weights[index] = "0";
         parentNode[property] = weights.join(",");
       }
     }
     else
       node.classList.add(collapsedClass);
   }
 }