Bug 599122: Don't initialize PSM on child. r=honza a=blocking-fennec-2.0b2

netwerk/protocol/http/nsHttpHandler.cpp

@@ -1527,6 +1527,10 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
         if (mPipeliningOverSSL)
             caps |= NS_HTTP_ALLOW_PIPELINING;
 
+#ifdef MOZ_IPC
+        if (!IsNeckoChild()) 
+#endif
+        {
             // HACK: make sure PSM gets initialized on the main thread.
             nsCOMPtr<nsISocketProviderService> spserv =
                     do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID);
@@ -1535,6 +1539,7 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
                 spserv->GetSocketProvider("ssl", getter_AddRefs(provider));
             }
         }
+    }
 
     rv = httpChannel->Init(uri, caps, proxyInfo);
     if (NS_FAILED(rv))