Issue 3499 - Use new messaging API in the content policy implementation

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * @fileOverview Content policy implementation, responsible for blocking things.
  */
 
 "use strict";
 
 let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 let {Utils} = require("utils");
+let {port} = require("messaging");
 let {Prefs} = require("prefs");
 let {FilterStorage} = require("filterStorage");
 let {BlockingFilter, WhitelistFilter, RegExpFilter} = require("filterClasses");
 let {defaultMatcher} = require("matcher");
 let {ElemHide} = require("elemHide");
 
 /**
  * Public policy checking functions and auxiliary objects
  * @class
  */
@@ skipping 42 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);
 
-    Utils.addChildMessageListener("AdblockPlus:ShouldAllow", message => this.shouldAllow(message));
+    port.on("shouldAllow", (message, sender) => this.shouldAllow(message));
 
     // Generate class identifier used to collapse nodes and register
     // corresponding stylesheet.
     let collapsedClass = "";
     let offset = "a".charCodeAt(0);
     for (let i = 0; i < 20; i++)
       collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
-    Utils.addChildMessageListener("AdblockPlus:GetCollapsedClass", () => collapsedClass);
+    port.on("getCollapsedClass", (message, sender) => collapsedClass);
 
     let collapseStyle = Services.io.newURI("data:text/css," +
         encodeURIComponent("." + collapsedClass +
         "{-moz-binding: url(chrome://global/content/bindings/general.xml#foobarbazdummy) !important;}"), null, null);
     Utils.styleService.loadAndRegisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
     onShutdown.add(() =>
     {
       Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
     });
   },
@@ skipping 157 matching lines @@
     return (result instanceof WhitelistFilter ? result : null);
   },
 
   /**
    * Deletes nodes that were previously stored with a
    * RequestNotifier.storeNodesForEntries() call or similar.
    * @param {string} id  unique ID of the nodes
    */
   deleteNodes: function(id)
   {
-    let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-                           .getService(Ci.nsIMessageBroadcaster);
-    messageManager.broadcastAsyncMessage("AdblockPlus:DeleteNodes", id);
+    port.emit("deleteNodes", id);
   },
 
   /**
    * Asynchronously re-checks filters for nodes given by an ID previously
    * returned by a RequestNotifier.storeNodesForEntries() call or similar.
    * @param {string} id  unique ID of the nodes
    * @param {RequestEntry} entry
    */
   refilterNodes: function(id, entry)
   {
-    let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-                           .getService(Ci.nsIMessageBroadcaster);
-    messageManager.broadcastAsyncMessage("AdblockPlus:RefilterNodes", {
+    port.emit("refilterNodes", {
       nodesID: id,
       entry: entry
     });
   }
 };
 Policy.init();
 
 /**
  * Extracts the hostname from a URL (might return null).
  */
@@ skipping 98 matching lines @@
   {
     // EffectiveTLDService throws on IP addresses, just compare the host name
     let host = "";
     try
     {
       host = uri.host;
     } catch (e) {}
     return host != docDomain;
   }
 }