From 63b5bf2ec8299cfeed2cd0034136bbd2ab9e9503 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 6 Feb 2015 16:03:49 -0500
Subject: [PATCH] Bug 1090448 - Enable printing with e10s windows on Linux.
 r=felipe.

---
 browser/app/profile/firefox.js                |  7 -----
 .../components/printing/content/printUtils.js | 26 -------------------
 2 files changed, 33 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index bb4193bf7f4..76a1543663e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1856,13 +1856,6 @@ pref("privacy.trackingprotection.ui.enabled", false);
 pref("browser.tabs.remote.autostart.1", true);
 #endif
 
-// Temporary pref to allow printing in e10s windows on some platforms.
-#ifdef UNIX_BUT_NOT_MAC
-pref("print.enable_e10s_testing", false);
-#else
-pref("print.enable_e10s_testing", true);
-#endif
-
 #ifdef NIGHTLY_BUILD
 // Enable e10s add-on interposition by default.
 pref("extensions.interposition.enabled", true);
diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js
index f0975557cc3..d67dd6b704e 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -69,22 +69,6 @@ var gSavePrintSettings = false;
 var gFocusedElement = null;
 
 var PrintUtils = {
-  bailOut: function () {
-    let pref = Components.classes["@mozilla.org/preferences-service;1"]
-                         .getService(Components.interfaces.nsIPrefBranch);
-    let allow_for_testing = false;
-    try {
-      allow_for_testing = pref.getBoolPref("print.enable_e10s_testing");
-    } catch(e) {
-      // The pref wasn't set, so I guess we're not overriding.
-    }
-    if (this.usingRemoteTabs && !allow_for_testing) {
-      alert("e10s printing is not implemented yet. Bug 927188.");
-      return true;
-    }
-    return false;
-  },
-
   /**
    * Shows the page setup dialog, and saves any settings changed in
    * that dialog if print.save_print_settings is set to true.
@@ -92,9 +76,6 @@ var PrintUtils = {
    * @return true on success, false on failure
    */
   showPageSetup: function () {
-    if (this.bailOut()) {
-      return;
-    }
     try {
       var printSettings = this.getPrintSettings();
       var PRINTPROMPTSVC = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
@@ -132,10 +113,6 @@ var PrintUtils = {
    */
   print: function (aWindow, aBrowser)
   {
-    if (this.bailOut()) {
-      return;
-    }
-
     if (!aWindow) {
       // If we're using remote browsers, chances are that window.content will
       // not be defined.
@@ -205,9 +182,6 @@ var PrintUtils = {
    */
   printPreview: function (aListenerObj)
   {
-    if (this.bailOut()) {
-      return;
-    }
     // if we're already in PP mode, don't set the listener; chances
     // are it is null because someone is calling printPreview() to
     // get us to refresh the display.