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/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -596,7 +596,7 @@ nsGenericHTMLFrameElement::GetAppManifestURL(nsAString& aOut)

  // Only allow content process to embed an app when nested content
  // process is enabled.
-  if (!XRE_IsParentProcess() &&
+  if (XRE_GetProcessType() != GeckoProcessType_Default &&
      !(GetBoolAttr(nsGkAtoms::Remote) && NestedEnabled())){
    NS_WARNING("Can't embed-apps. Embed-apps is restricted to in-proc apps "
               "or content processes with nested pref enabled, see bug 1097479");