Issue 3251 - Simplify messaging from child scripts to parent

lib/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 60 matching lines @@
 
   /**
    * Called on module startup, initializes various exported properties.
    */
   init: function()
   {
     // whitelisted URL schemes
     for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
       this.whitelistSchemes.add(scheme);
 
-    let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-                           .getService(Ci.nsIMessageListenerManager)
-                           .QueryInterface(Ci.nsIMessageBroadcaster);
-    let handler = (message => JSON.stringify(this.shouldAllow(message.data)));
-    messageManager.addMessageListener("AdblockPlus:ShouldAllow", handler);
-    onShutdown.add(() => messageManager.removeMessageListener("AdblockPlus:ShouldAllow", handler));
-
-    let handler2 = () => collapsedClass;
-    messageManager.addMessageListener("AdblockPlus:GetCollapsedClass", handler2);
-    onShutdown.add(() => messageManager.removeMessageListener("AdblockPlus:GetCollapsedClass", handler2));
+    Utils.addChildMessageListener("AdblockPlus:ShouldAllow", this.shouldAllow.bind(this));
+    Utils.addChildMessageListener("AdblockPlus:GetCollapsedClass", () => collapsedClass);
 
     // Generate class identifier used to collapse node and register corresponding
     // stylesheet.
     let offset = "a".charCodeAt(0);
     for (let i = 0; i < 20; i++)
       collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
 
     let collapseStyle = Services.io.newURI("data:text/css," +
         encodeURIComponent("." + collapsedClass +
         "{-moz-binding: url(chrome://global/content/bindings/general.xml#foobarbazdummy) !important;}"), null, null);
@@ skipping 310 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == "OBJECT")
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, entry.location, true);
 }