From 11251ccf28f670b1d25e64e6089a5fd816656002 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Tue, 6 Nov 2012 10:42:27 -0800
Subject: [PATCH] Bug 808866 - do not create location providers in child
 process. r=jdm/amarchesini a=blocking-basecamp

---
 dom/src/geolocation/nsGeolocation.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index b70d109ed1e1..a1ddb04f411f 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -574,6 +574,11 @@ nsresult nsGeolocationService::Init()
     return NS_ERROR_FAILURE;
   }
 
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
+    sGeoInitPending = false;
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIGeolocationProvider> provider = do_GetService(NS_GEOLOCATION_PROVIDER_CONTRACTID);
   if (provider) {
     mProviders.AppendObject(provider);