Fix build bustage

dom/ipc/ContentProcessChild.cpp

@@ -6,9 +6,7 @@
 
 #include "mozilla/ipc/TestShellChild.h"
 
-#include "mozilla/XPCOM.h"
-#include "nsXPFEComponentsCID.h"
-#include "nsIAppStartup.h"
+#include "nsXULAppAPI.h"
 
 using namespace mozilla::ipc;
 
@@ -78,10 +76,7 @@ ContentProcessChild::Quit()
     mIFrames.Clear();
     mTestShells.Clear();
 
-    nsCOMPtr<nsIAppStartup> appStartup(do_GetService(NS_APPSTARTUP_CONTRACTID));
-    if (appStartup) {
-        appStartup->Quit(nsIAppStartup::eForceQuit);
-    }
+    XRE_ShutdownChildProcess();
 }
 
 } // namespace dom

toolkit/library/dlldeps-xul.cpp

@@ -55,4 +55,5 @@ void xxxNeverCalledXUL()
   XRE_InitParentProcess(0, nsnull, nsnull, nsnull);
   XRE_RunTestShell(0, nsnull);
   XRE_GetProcessType();
+  XRE_ShutdownChildProcess();
 }

toolkit/xre/nsEmbedFunctions.cpp

@@ -42,6 +42,7 @@
 #include "prenv.h"
 
 #include "nsIAppShell.h"
+#include "nsIAppStartup.h"
 #include "nsIAppStartupNotifier.h"
 #include "nsIDirectoryService.h"
 #include "nsILocalFile.h"
@@ -56,6 +57,7 @@
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsWidgetsCID.h"
+#include "nsXPFEComponentsCID.h"
 #include "nsXREDirProvider.h"
 
 #ifdef MOZ_IPC
@@ -496,4 +498,14 @@ XRE_RunIPCTestHarness(int aArgc, char* aArgv[])
     NS_ENSURE_SUCCESS(rv, 1);
     return 0;
 }
+
+void
+XRE_ShutdownChildProcess()
+{
+    nsCOMPtr<nsIAppStartup> appStartup(do_GetService(NS_APPSTARTUP_CONTRACTID));
+    if (appStartup) {
+        appStartup->Quit(nsIAppStartup::eForceQuit);
+    }
+}
+
 #endif

xpcom/build/nsXULAppAPI.h

@@ -473,4 +473,7 @@ XRE_API(int,
         XRE_RunIPCTestHarness, (int aArgc,
                                 char* aArgv[]))
 
+XRE_API(void,
+        XRE_ShutdownChildProcess, ())
+
 #endif // _nsXULAppAPI_h__