From 509c62015f30561307e16ee803de689535262db7 Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Mon, 9 Aug 2010 18:46:20 -0400
Subject: [PATCH] Don't bother checking if NSS is in a child process unless
 MOZ_IPC is defined. r+a+=bz Followup to Bug 559711. e10s HTTP: turn off NSS
 in child process(es)

---
 security/manager/ssl/src/nsNSSComponent.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 7c69af7865f..0bd17002fae 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -120,7 +120,9 @@
 #include "secerr.h"
 #include "sslerr.h"
 
+#ifdef MOZ_IPC
 #include "nsXULAppAPI.h"
+#endif
 
 #ifdef XP_WIN
 #include "nsILocalFileWin.h"
@@ -285,10 +287,12 @@ nsTokenEventRunnable::Run()
 // creating any other components.
 PRBool EnsureNSSInitialized(EnsureNSSOperator op)
 {
+#ifdef MOZ_IPC
   if (GeckoProcessType_Default != XRE_GetProcessType()) {
     NS_ERROR("Trying to initialize PSM/NSS in a non-chrome process!");
     return PR_FALSE;
   }
+#endif
 
   static PRBool loading = PR_FALSE;
   static PRInt32 haveLoaded = 0;