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/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -589,7 +589,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
  }
 #endif

-  if (XRE_IsContentProcess()) {
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
    process = kContent;
  } else {
    process = kMain;