Issue 3486 - Issue reporter: check whether window is private in the content process

chrome/content/ui/sendReport.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
  * 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/>.
  */
 
 //
 // Report data template, more data will be added during data collection
 //
 
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 let {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-let {PrivateBrowsingUtils} = Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", {});
 
 const MILLISECONDS_IN_SECOND = 1000;
 const SECONDS_IN_MINUTE = 60;
 const SECONDS_IN_HOUR = 60 * SECONDS_IN_MINUTE;
 const SECONDS_IN_DAY = 24 * SECONDS_IN_HOUR;
 
 let contentWindow = window.arguments[0];
 let windowURI = window.arguments[1];
 if (typeof windowURI == "string")
   windowURI = Services.newURI(windowURI, null, null);
 let browser = window.arguments[2];
+let isPrivate = false;
 
 let reportData = new DOMParser().parseFromString("<report></report>", "text/xml");
 
 // Some helper functions to work with the report data
 function reportElement(tag)
 {
   for (let child = reportData.documentElement.firstChild; child; child = child.nextSibling)
     if (child.nodeType == Node.ELEMENT_NODE && child.tagName == tag)
       return child;
   let element = reportData.createElement(tag);
@@ skipping 45 matching lines @@
   let element = reportElement("platform");
   element.setAttribute("name", "Gecko");
   element.setAttribute("version", Services.appinfo.platformVersion);
   element.setAttribute("build", Services.appinfo.platformBuildID);
 };
 {
   let element = reportElement("options");
   appendElement(element, "option", {id: "enabled"}, Prefs.enabled);
   appendElement(element, "option", {id: "objecttabs"}, Prefs.frameobjects);
   appendElement(element, "option", {id: "collapse"}, !Prefs.fastcollapse);
-  appendElement(element, "option", {id: "privateBrowsing"}, PrivateBrowsingUtils.isContentWindowPrivate(contentWindow));
   appendElement(element, "option", {id: "subscriptionsAutoUpdate"}, Prefs.subscriptions_autoupdate);
   appendElement(element, "option", {id: "javascript"}, Services.prefs.getBoolPref("javascript.enabled"));
   appendElement(element, "option", {id: "cookieBehavior"}, Services.prefs.getIntPref("network.cookie.cookieBehavior"));
 };
 
 //
 // Data collectors
 //
 
 var reportsListDataSource =
@@ skipping 213 matching lines @@
   collectData: function(wnd, windowURI, browser, callback)
   {
     let outerWindowID = wnd.QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindowUtils)
                            .outerWindowID;
     let dataCollector = require("dataCollector");
     let screenshotWidth = screenshotDataSource.getWidth();
     dataCollector.collectData(outerWindowID, screenshotWidth, 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();
     });
   }
 }
 
 var screenshotDataSource =
 {
   imageOffset: 10,
 
   // Fields used for user interaction
@@ skipping 1166 matching lines @@
 
   if (success)
   {
     try
     {
       let link = request.responseXML.getElementById("link").getAttribute("href");
       let button = E("copyLink");
       button.setAttribute("url", link);
       button.removeAttribute("disabled");
 
-      if (!PrivateBrowsingUtils.isContentWindowPrivate(contentWindow))
+      if (!isPrivate)
         reportsListDataSource.addReport(framesDataSource.site, link);
     } catch (e) {}
     E("copyLinkBox").hidden = false;
 
     document.documentElement.getButton("finish").disabled = false;
     document.documentElement.getButton("cancel").disabled = true;
     E("progressBar").activeItemComplete = true;
   }
 }
 
@@ skipping 19 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;");
 }