Execute operations of ChildProcessLauncher on launcher thread

content/browser/android/child_process_launcher_android.cc

 // Copyright (c) 2012 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/android/child_process_launcher_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
 }
 
 }  // anonymous namespace
 
 // Called from ChildProcessLauncher.java when the ChildProcess was
 // started.
 // |client_context| is the pointer to StartChildProcessCallback which was
 // passed in from StartChildProcess.
 // |handle| is the processID of the child process as originated in Java, 0 if
 // the ChildProcess could not be created.
 static void OnChildProcessStarted(JNIEnv*,

[Yaron, 2015/09/14 22:30:59]

This is now always happening on the process_launcher thread but note the comment
in child_process_launcher.cc. Please remove the comment and the posted task.

[Jaekyun Seok (inactive), 2015/09/14 23:44:11]

Done.

                                   const JavaParamRef<jclass>&,
                                   jlong client_context,
                                   jint handle) {
   StartChildProcessCallback* callback =
       reinterpret_cast<StartChildProcessCallback*>(client_context);
   if (handle)
     callback->Run(static_cast<base::ProcessHandle>(handle));
   delete callback;
 }
 
@@ skipping 121 matching lines @@
   return gfx::ScopedJavaSurface::AcquireExternalSurface(
       Java_ChildProcessLauncher_getSurfaceTextureSurface(
           env, surface_texture_id, client_id).obj());
 }
 
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
+static void ExecuteOnLauncherThread(
+    const base::android::JavaRef<jobject>& runnable) {
+  JNIEnv* env = AttachCurrentThread();
+  DCHECK(env);
+  Java_ChildProcessLauncher_executeOnLauncherThread(env, runnable.obj());
+}
+
+jboolean RunOnLauncherThread(JNIEnv* env,
+                             const JavaParamRef<jclass>& clazz,
+                             const JavaParamRef<jobject>& jrunnable,
+                             jlong delayInMS) {
+  if (!BrowserThread::IsThreadInitialized(BrowserThread::PROCESS_LAUNCHER))
+    return false;
+
+  if (delayInMS > 0) {
+    ScopedJavaGlobalRef<jobject> scoped_runnable;
+    scoped_runnable.Reset(env, jrunnable.obj());
+    BrowserThread::PostDelayedTask(
+        BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
+        base::Bind(&ExecuteOnLauncherThread, scoped_runnable),
+        base::TimeDelta::FromMilliseconds(delayInMS));
+  } else if (BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER)) {
+    ExecuteOnLauncherThread(jrunnable);
+  } else {
+    ScopedJavaGlobalRef<jobject> scoped_runnable;
+    scoped_runnable.Reset(env, jrunnable.obj());
+    BrowserThread::PostTask(
+        BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
+        base::Bind(&ExecuteOnLauncherThread, scoped_runnable));
+  }
+  return true;
+}
+
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content