bug 46989, cookies don't work if components.reg is missing, r=dougt

git-svn-id: svn://10.0.0.236/trunk@76153 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/xpfe/appshell/src/nsAppShellService.cpp

@@ -133,14 +133,6 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService,
       mSplashScreen = do_QueryInterface( aNativeAppSupportOrSplashScreen );
   }
 
-  // Create the Event Queue for the UI thread...
-  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID,
-                  &rv);
-  if (NS_OK == rv) {
-    // XXX: What if this fails?
-    rv = eventQService->CreateThreadEventQueue();
-  }
-
   NS_WITH_SERVICE(nsIMetaCharsetService, metacharset, kMetaCharsetCID, &rv);
   if(NS_FAILED(rv)) {
     goto done;

mozilla/xpfe/bootstrap/nsAppRunner.cpp

@@ -60,6 +60,7 @@
 #include "nsIChromeRegistry.h"
 #include "nsIContentHandler.h"
 #include "nsIBrowserInstance.h"
+#include "nsIEventQueueService.h"
 #include "nsAppFileLocationProvider.h"
 
 // Interfaces Needed
@@ -90,6 +91,7 @@ static NS_DEFINE_IID(kIWindowMediatorIID,NS_IWINDOWMEDIATOR_IID);
 static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
 static NS_DEFINE_CID(kWalletServiceCID,     NS_WALLETSERVICE_CID);
 static NS_DEFINE_CID(kBrowserContentHandlerCID, NS_BROWSERCONTENTHANDLER_CID);
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
 
 #define HELP_SPACER_1   "\t"
@@ -756,6 +758,14 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
   fpsetmask(0);
 #endif
 
+  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID,
+                  &rv);
+  if (NS_OK == rv) {
+    // XXX: What if this fails?
+    rv = eventQService->CreateThreadEventQueue();
+  }
+
+
   // Setup an autoreg obserer, so that we can update a progress
   // string in the splash screen
   nsCOMPtr<nsIObserverService> obsService = do_GetService(NS_OBSERVERSERVICE_PROGID);