Backed out changeset 56ae8059453e (bug 1738984) to see if it fixes bug 1745043. a=me

netwerk/base/nsNetUtil.cpp

@@ -9,7 +9,6 @@
 
 #include "nsNetUtil.h"
 
-#include "mozilla/AppShutdown.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
@@ -2710,11 +2709,6 @@ void net_EnsurePSMInit() {
     return;
   }
 
-  // Avoid a late initialization
-  if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownNetTeardown)) {
-    return;
-  }
-
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(NS_IsMainThread());
 

netwerk/protocol/http/nsHttpHandler.cpp

@@ -66,7 +66,6 @@
 #include "mozilla/net/SocketProcessParent.h"
 #include "mozilla/net/SocketProcessChild.h"
 #include "mozilla/ipc/URIUtils.h"
-#include "mozilla/AppShutdown.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "mozilla/AntiTrackingRedirectHeuristic.h"
@@ -2060,11 +2059,6 @@ nsHttpHandler::NewProxiedChannel(nsIURI* uri, nsIProxyInfo* givenProxyInfo,
     httpChannel = new nsHttpChannel();
   }
 
-  // Avoid a late initialization
-  if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownNetTeardown)) {
-    return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
-  }
-
   return SetupChannelInternal(httpChannel, uri, givenProxyInfo,
                               proxyResolveFlags, proxyURI, aLoadInfo, result);
 }

security/manager/ssl/nsNSSComponent.cpp

@@ -2246,11 +2246,6 @@ nsresult nsNSSComponent::Init() {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  // Avoid a late initialization
-  if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownNetTeardown)) {
-    return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
-  }
-
   Telemetry::AutoScalarTimer<Telemetry::ScalarID::NETWORKING_NSS_INITIALIZATION>
       timer;