Backed out changeset 6e0936ea7f4a (bug 1648189) on dev's request, for causing mda failures on beta sims. CLOSED TREE

netwerk/base/nsIOService.cpp

@@ -527,7 +527,7 @@ nsresult nsIOService::LaunchSocketProcess() {
     return NS_OK;
   }
 
-  if (!UseSocketProcess(true)) {
+  if (!Preferences::GetBool("network.process.enabled", true)) {
     LOG(("nsIOService skipping LaunchSocketProcess because of the pref"));
     return NS_OK;
   }
@@ -585,14 +585,13 @@ bool nsIOService::UseSocketProcess(bool aCheckAgain) {
     return sUseSocketProcess;
   }
 
-  if (PR_GetEnv("MOZ_FORCE_USE_SOCKET_PROCESS")) {
-    sUseSocketProcess = true;
-    return sUseSocketProcess;
-  }
-
   if (StaticPrefs::network_process_enabled()) {
-    sUseSocketProcess =
-        StaticPrefs::network_http_network_access_on_socket_process_enabled();
+    if (PR_GetEnv("MOZ_FORCE_USE_SOCKET_PROCESS")) {
+      sUseSocketProcess = true;
+    } else {
+      sUseSocketProcess =
+          StaticPrefs::network_http_network_access_on_socket_process_enabled();
+    }
   }
   return sUseSocketProcess;
 }