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

lib/child/contextMenu.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 111 matching lines @@
   {
     if (subject.wrappedJSObject)
       subject = subject.wrappedJSObject;
 
     if (subject.addonInfo)
       subject.addonInfo.adblockplus = getContextInfo(subject.event);
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver])
 };
 
-let addObserver = Utils.getPropertyWithoutCompatShims(Services.obs, "addObserver");
-addObserver.call(Services.obs, ContextMenuObserver, "content-contextmenu", true);
-addObserver.call(Services.obs, ContextMenuObserver, "AdblockPlus:content-contextmenu", true);
+Services.obs.addObserver(ContextMenuObserver, "content-contextmenu", true);
+Services.obs.addObserver(ContextMenuObserver, "AdblockPlus:content-contextmenu", true);
 onShutdown.add(() => {
-  let removeObserver = Utils.getPropertyWithoutCompatShims(Services.obs, "removeObserver");
-  removeObserver.call(Services.obs, ContextMenuObserver, "content-contextmenu");
-  removeObserver.call(Services.obs, ContextMenuObserver, "AdblockPlus:content-contextmenu");
+  Services.obs.removeObserver(ContextMenuObserver, "content-contextmenu");
+  Services.obs.removeObserver(ContextMenuObserver, "AdblockPlus:content-contextmenu");
 });