Issue 3499 - Use the new messaging API for the issue reporter

chrome/content/ui/sendReport.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
@@ skipping 299 matching lines @@
       }
     }
     callback();
   }
 };
 
 var remoteDataSource =
 {
   collectData: function(outerWindowID, windowURI, browser, callback)
   {
-    let dataCollector = require("dataCollector");
+    let {port} = require("messaging");
     let screenshotWidth = screenshotDataSource.getWidth();
-    dataCollector.collectData(outerWindowID, screenshotWidth, data => {
+    port.emitWithResponse("collectData", {outerWindowID, screenshotWidth})
+        .then(data =>
+    {
       screenshotDataSource.setData(data && data.screenshot);
       framesDataSource.setData(windowURI, data && data.opener, data && data.referrer, data && data.frames);
 
       if (data && data.isPrivate)
         isPrivate = true;
       let element = reportElement("options");
       appendElement(element, "option", {id: "privateBrowsing"}, isPrivate);
 
       callback();
     });
@@ skipping 1221 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }