Merge backout of bug 596762. a=bustage

browser/app/profile/firefox.js

@@ -934,12 +934,14 @@ pref("toolbar.customization.usesheet", false);
 // The default for this pref reflects whether the build is capable of IPC.
 // (Turning it on in a no-IPC build will have no effect.)
 #ifdef XP_MACOSX
-// i386 ipc preferences
-pref("dom.ipc.plugins.enabled.i386", false);
-pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
-pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
-// x86_64 ipc preferences
-pref("dom.ipc.plugins.enabled.x86_64", true);
+// OSX still has only partial support for IPC.  Note that the PowerPC
+// and x86 builds must generate identical copies of this file, so we
+// can't make the prefs indicate that IPC is not available at all in
+// PowerPC builds.
+pref("dom.ipc.plugins.enabled", false);
+// These plug-ins will run OOP by default
+pref("dom.ipc.plugins.enabled.flash player.plugin", true);
+pref("dom.ipc.plugins.enabled.javaplugin2_npapi.plugin", true);
 #elifdef MOZ_IPC
 pref("dom.ipc.plugins.enabled", true);
 #else

modules/plugin/base/src/nsNPAPIPlugin.cpp

@@ -373,17 +373,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
   prefFile.Cut(0, slashPos + 1);
   ToLowerCase(prefFile);
 
-#ifdef XP_MACOSX
-#if defined(__i386__)
-  nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.i386.");
-#elif defined(__x86_64__)
-  nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.x86_64.");
-#elif defined(__ppc__)
-  nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.ppc.");
-#endif
-#else
   nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.");
-#endif
 
   PRUint32 prefCount;
   char** prefNames;
@@ -423,17 +413,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
 
   if (!prefSet) {
     oopPluginsEnabled = PR_FALSE;
-#ifdef XP_MACOSX
-#if defined(__i386__)
-    prefs->GetBoolPref("dom.ipc.plugins.enabled.i386", &oopPluginsEnabled);
-#elif defined(__x86_64__)
-    prefs->GetBoolPref("dom.ipc.plugins.enabled.x86_64", &oopPluginsEnabled);
-#elif defined(__ppc__)
-    prefs->GetBoolPref("dom.ipc.plugins.enabled.ppc", &oopPluginsEnabled);
-#endif
-#else
     prefs->GetBoolPref("dom.ipc.plugins.enabled", &oopPluginsEnabled);
-#endif
   }
 
   return oopPluginsEnabled;