Revert crrev.com/c/1548839 and crrev.com/c/1549478

This reverts commits 63d7033a
("Do not block shutdown for process launch") and
6dc816e5 ("Launch child unsandboxed
processes in "Kill on Job Close" job.").

Reason for revert: Causes browser_tests time-outs on Windows.

Bug: 952529, 830954
Change-Id: I01ec7c713e0d406e3049d4e1d2e508204afd0aa5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570193Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Commit-Queue: Bob Haarman <inglorion@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652342}

content/browser/child_process_launcher_helper.cc

@@ -227,22 +227,13 @@ base::SingleThreadTaskRunner* GetProcessLauncherTaskRunner() {
       launcher_task_runner(
           android::LauncherThread::GetMessageLoop()->task_runner());
   return (*launcher_task_runner).get();
-#else  // defined(OS_ANDROID)
-  constexpr base::TaskShutdownBehavior shutdown_behavior =
-#if defined(OS_WIN)
-      base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN;
-#else
-      // Linux could use CONTINUE_ON_SHUTDOWN if ZygoteHostImpl was leaked on
-      // shutdown. Mac could use CONTINUE_ON_SHUTDOWN if PluginServiceImpl was
-      // leaked on shutdown.
-      base::TaskShutdownBehavior::BLOCK_SHUTDOWN;
-#endif  // defined(OS_WIN)
+#else   // defined(OS_ANDROID)
   // TODO(http://crbug.com/820200): Investigate whether we could use
   // SequencedTaskRunner on platforms other than Windows.
   static base::LazySingleThreadTaskRunner launcher_task_runner =
       LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
           base::TaskTraits({base::MayBlock(), base::TaskPriority::USER_BLOCKING,
-                            shutdown_behavior}),
+                            base::TaskShutdownBehavior::BLOCK_SHUTDOWN}),
           base::SingleThreadTaskRunnerThreadMode::DEDICATED);
   return launcher_task_runner.Get().get();
 #endif  // defined(OS_ANDROID)

services/service_manager/sandbox/win/sandbox_win.cc

@@ -862,12 +862,13 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
     options.handles_to_inherit = handles_to_inherit;
     BOOL in_job = true;
     // Prior to Windows 8 nested jobs aren't possible.
-    if (base::win::GetVersion() >= base::win::VERSION_WIN8 ||
-        (::IsProcessInJob(::GetCurrentProcess(), nullptr, &in_job) &&
-         !in_job)) {
-      // Launch the process in a job to ensure that it doesn't outlive the
-      // browser. This could happen if there is a lot of I/O on process
-      // shutdown, in which case TerminateProcess would fail.
+    if (sandbox_type == SANDBOX_TYPE_NETWORK &&
+        (base::win::GetVersion() >= base::win::VERSION_WIN8 ||
+         (::IsProcessInJob(::GetCurrentProcess(), nullptr, &in_job) &&
+          !in_job))) {
+      // Launch the process in a job to ensure that the network process doesn't
+      // outlive the browser. This could happen if there is a lot of I/O on
+      // process shutdown, in which case TerminateProcess would fail.
       // https://crbug.com/820996
       if (!g_job_object_handle) {
         sandbox::Job job_obj;