Revert of Remove post_launch_on_client_thread_called

content/browser/child_process_launcher_helper_android.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_android.h"
 
 #include <memory>
 
 #include "base/android/apk_assets.h"
 #include "base/android/jni_array.h"
@@ skipping 181 matching lines @@
 void ChildProcessLauncherHelper::ResetRegisteredFilesForTesting() {
   ResetFilesToShareForTestingPosix();
 }
 
 // static
 base::File OpenFileToShare(const base::FilePath& path,
                            base::MemoryMappedFile::Region* region) {
   return base::File(base::android::OpenApkAsset(path.value(), region));
 }
 
-// Called from ChildProcessLauncher.java when the ChildProcess was started.
+// Called from ChildProcessLauncher.java when the ChildProcess was
+// started.
 // |handle| is the processID of the child process as originated in Java, 0 if
 // the ChildProcess could not be created.
 void ChildProcessLauncherHelper::OnChildProcessStarted(
     JNIEnv*,
     const base::android::JavaParamRef<jobject>& obj,
     jint handle) {
-  DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER);
   scoped_refptr<ChildProcessLauncherHelper> ref(this);
   Release();  // Balances with LaunchProcessOnLauncherThread.
 
   int launch_result = (handle == base::kNullProcessHandle)
                           ? LAUNCH_RESULT_FAILURE
                           : LAUNCH_RESULT_SUCCESS;
 
+  // TODO(jcivelli): Remove this by defining better what happens on what thread
+  // in the corresponding Java code.
   ChildProcessLauncherHelper::Process process;
   process.process = base::Process(handle);
-  PostLaunchOnLauncherThread(std::move(process), launch_result);
+  if (BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER)) {
+    PostLaunchOnLauncherThread(std::move(process), launch_result,
+                               false);  // post_launch_on_client_thread_called
+    return;
+  }
+
+  bool on_client_thread = BrowserThread::CurrentlyOn(
+      static_cast<BrowserThread::ID>(client_thread_id()));
+  BrowserThread::PostTask(
+      BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
+      base::Bind(&ChildProcessLauncherHelper::PostLaunchOnLauncherThread, this,
+                 base::Passed(std::move(process)), launch_result,
+                 on_client_thread));
+  if (on_client_thread) {
+    ChildProcessLauncherHelper::Process process;
+    process.process = base::Process(handle);
+    PostLaunchOnClientThread(std::move(process), launch_result);
+  }
 }
 
 // static
 size_t ChildProcessLauncherHelper::GetNumberOfRendererSlots() {
   return static_cast<size_t>(
       Java_ChildProcessLauncherHelper_getNumberOfRendererSlots(
           AttachCurrentThread()));
 }
 
 }  // namespace internal
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return internal::RegisterNativesImpl(env);
 }
 
 }  // namespace content