Backed out changeset 8b4e4083639e (bug 1171931) for B2G debug emulator bustage.

2015-06-25 19:48:42 -04:00
parent 26cddc3bad
commit 7aba9d7002
201 changed files with 579 additions and 506 deletions
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -249,7 +249,7 @@ nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID,
 bool
 nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
 {
-  if (XRE_IsContentProcess()) {
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
    return true;
  }

@@ -404,7 +404,7 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag)
    return nullptr;
  }

-  if (XRE_IsContentProcess()) {
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
    return PluginModuleContentParent::LoadModule(aPluginTag->mId);
  }