Backed out changeset e1f294f7ca90 (bug 1097804)

xpcom/libxpcomrt/XPCOMRTInit.cpp

@@ -13,8 +13,6 @@
 #include "nsDebugImpl.h"
 #include "nsIErrorService.h"
 #include "nsMemoryImpl.h"
-#include "nsNetCID.h"
-#include "nsNetModuleStandalone.h"
 #include "nsObserverService.h"
 #include "nsThreadManager.h"
 #include "nsThreadPool.h"
@@ -100,8 +98,6 @@ NS_InitXPCOMRT()
     return rv;
   }
 
-  mozilla::InitNetModuleStandalone();
-
   return NS_OK;
 }
 
@@ -156,11 +152,6 @@ NS_ShutdownXPCOMRT()
 
     NS_ProcessPendingEvents(thread);
 
-    // Net module needs to be shutdown before the thread manager or else
-    // the thread manager will hang waiting for the socket transport
-    // service to shutdown.
-    mozilla::ShutdownNetModuleStandalone();
-
     // Shutdown all remaining threads.  This method does not return until
     // all threads created using the thread manager (with the exception of
     // the main thread) have exited.