From 7e86de840255512ecacc5328a9abd41632035b1a Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Thu, 21 Jan 2016 15:56:10 -0700
Subject: [PATCH] Bug 1241668: Disable dom.ipc.plugins.asyncInit.enabled
 unconditionally; r=bsmedberg

--HG--
extra : rebase_source : 0aaf2b5c040f2c78ec76afb87b821c8c7cfd4bef
---
 modules/libpref/init/all.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index dbb6949b69de..da284dbcc4c7 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2617,13 +2617,8 @@ pref("dom.ipc.plugins.reportCrashURL", true);
 // Defaults to 30 seconds.
 pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
 
-// Asynchronous plugin initialization should only be enabled on non-e10s
-// channels until some remaining bugs are resolved.
-#ifdef E10S_TESTING_ONLY
+// Asynchronous plugin initialization is on hold.
 pref("dom.ipc.plugins.asyncInit.enabled", false);
-#else
-pref("dom.ipc.plugins.asyncInit.enabled", true);
-#endif
 
 // Allow the AsyncDrawing mode to be used for plugins.
 pref("dom.ipc.plugins.asyncdrawing.enabled", true);