Revert of Remove post_launch_on_client_thread_called

content/browser/child_process_launcher_helper.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/child_process_launcher_helper.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "content/browser/child_process_launcher.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
@@ skipping 86 matching lines @@
   BeforeLaunchOnLauncherThread(*files_to_register, &options);
 
   Process process = LaunchProcessOnLauncherThread(options,
                                                   std::move(files_to_register),
                                                   &is_synchronous_launch,
                                                   &launch_result);
 
   AfterLaunchOnLauncherThread(process, options);
 
   if (is_synchronous_launch) {
-    PostLaunchOnLauncherThread(std::move(process), launch_result);
+    PostLaunchOnLauncherThread(std::move(process), launch_result, false);
   }
 }
 
 void ChildProcessLauncherHelper::PostLaunchOnLauncherThread(
     ChildProcessLauncherHelper::Process process,
-    int launch_result) {
+    int launch_result,
+    bool post_launch_on_client_thread_called) {
   // Release the client handle now that the process has been started (the pipe
   // may not signal when the process dies otherwise and we would not detect the
   // child process died).
   mojo_client_handle_.reset();
 
   if (process.process.IsValid()) {
-    RecordHistogramsOnLauncherThread(base::TimeTicks::Now() -
-                                     begin_launch_time_);
+    RecordHistogramsOnLauncherThread(
+        base::TimeTicks::Now() - begin_launch_time_);
   }
 
-  BrowserThread::PostTask(
-      client_thread_id_, FROM_HERE,
-      base::Bind(&ChildProcessLauncherHelper::PostLaunchOnClientThread, this,
-                 base::Passed(&process), launch_result));
+  if (!post_launch_on_client_thread_called) {
+    BrowserThread::PostTask(
+        client_thread_id_, FROM_HERE,
+        base::Bind(&ChildProcessLauncherHelper::PostLaunchOnClientThread,
+            this, base::Passed(&process), launch_result));
+  }
 }
 
 void ChildProcessLauncherHelper::PostLaunchOnClientThread(
     ChildProcessLauncherHelper::Process process,
     int error_code) {
   if (child_process_launcher_) {
     child_process_launcher_->Notify(
         std::move(process), std::move(mojo_server_handle_), error_code);
   } else if (process.process.IsValid() && terminate_on_shutdown_) {
     // Client is gone, terminate the process.
@@ skipping 15 matching lines @@
   // On Posix, EnsureProcessTerminated can lead to 2 seconds of sleep!
   // So don't do this on the UI/IO threads.
   BrowserThread::PostTask(
       BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
       base::Bind(&ChildProcessLauncherHelper::ForceNormalProcessTerminationSync,
                  base::Passed(&process)));
 }
 
 }  // namespace internal
 }  // namespace content