Backed out changeset 05c26697326a (bug 1710671) for multiple failures in obj-build/dist/include/mozilla/AlreadyAddRefed.h. CLOSED TREE

dom/ipc/ContentChild.cpp

@@ -118,7 +118,6 @@
 #include "nsBaseDragService.h"
 #include "nsDocShellLoadTypes.h"
 #include "nsFocusManager.h"
-#include "nsHttpHandler.h"
 #include "nsIConsoleService.h"
 #include "nsIInputStreamChannel.h"
 #include "nsILoadGroup.h"
@@ -2590,13 +2589,7 @@ mozilla::ipc::IPCResult ContentChild::RecvRemoteType(
 }
 
 // A method to initialize anything we need during the preallocation phase
-void ContentChild::PreallocInit() {
-  EnsureNSSInitializedChromeOrContent();
-
-  // SetAcceptLanguages() needs to read localized strings (file access),
-  // which is slow, so do this in prealloc
-  nsHttpHandler::PresetAcceptLanguages();
-}
+void ContentChild::PreallocInit() { EnsureNSSInitializedChromeOrContent(); }
 
 // Call RemoteTypePrefix() on the result to remove URIs if you want to use this
 // for telemetry.

netwerk/protocol/http/nsHttpHandler.cpp

@@ -1938,13 +1938,6 @@ static nsresult PrepareAcceptLanguages(const char* i_AcceptLanguages,
                                        &o_AcceptLanguages);
 }
 
-// Ensure that we've fetched the AcceptLanguages setting
-/* static */
-void nsHttpHandler::PresetAcceptLanguages() {
-  (void)GetInstance();
-  [[maybe_unused]] nsresult rv = gHttpHandler->SetAcceptLanguages();
-}
-
 nsresult nsHttpHandler::SetAcceptLanguages() {
   if (!NS_IsMainThread()) {
     nsCOMPtr<nsIThread> mainThread;

netwerk/protocol/http/nsHttpHandler.h

@@ -501,10 +501,6 @@ class nsHttpHandler final : public nsIHttpProtocolHandler,
 
   bool UseHTTPSRRForSpeculativeConnection() const;
 
-  // So we can ensure that this is done during process preallocation to
-  // avoid first-use overhead
-  static void PresetAcceptLanguages();
-
  private:
   nsHttpHandler();