Backed out changesets 3ab31cfb6837 (bug 1024965), 5cebb1e06e25 (bug 1029654), acd333921065 (bug 1024073). r=backout
authorBlair McBride <bmcbride@mozilla.com>
Thu, 31 Jul 2014 17:37:32 +1200
changeset 196897 54598200f301cffbb578730a33cb95ae040d9587
parent 196896 882720470f4febe23b345d34250717a081e6de7e
child 196898 ed3a204d252f637ec2d487e41f1d566171a87571
push id7987
push userbmcbride@mozilla.com
push dateThu, 31 Jul 2014 05:38:29 +0000
treeherderfx-team@f4ac52fb6c84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1024965, 1029654, 1024073
milestone34.0a1
backs out3ab31cfb6837bbcb7923888a44de40ad9d3d8576
Backed out changesets 3ab31cfb6837 (bug 1024965), 5cebb1e06e25 (bug 1029654), acd333921065 (bug 1024073). r=backout
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -811,43 +811,16 @@ pref("plugin.state.npmcffplg", 2);
 #endif
 
 // F5 Networks SSLVPN plugin, bug 985640
 #ifdef XP_MACOSX
 pref("plugin.state.f5 ssl vpn plugin", 2);
 pref("plugin.state.f5 sam inspection host plugin", 2);
 #endif
 
-// Roblox Launcher Plugin, bug 1024073
-#ifdef XP_WIN
-pref("plugin.state.nprobloxproxy", 2);
-#endif
-#ifdef XP_MACOSX
-pref("plugins.state.nproblox", 2);
-#endif
-
-// Box Edit, bug 1029654
-#ifdef XP_WIN
-pref("plugins.state.npboxedit", 2);
-#endif
-#ifdef XP_MACOSX
-pref("plugins.state.box edit", 2);
-#endif
-
-// Nexus Personal, bug 1024965
-#ifdef XP_WIN
-pref("plugins.state.np_prsnl", 2);
-#endif
-#ifdef XP_MACOSX
-pref("plugins.state.personalplugin", 2);
-#endif
-#ifdef UNIX_BUT_NOT_MAC
-pref("plugins.state.libplugins", 2);
-#endif
-
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
 #ifdef XP_MACOSX
 pref("browser.preferences.animateFadeIn", true);
 #else
 pref("browser.preferences.animateFadeIn", false);
 #endif