Unifying ChildProcessLauncher across platforms.

content/browser/android/child_process_launcher_android_jni.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 "content/browser/android/child_process_launcher_android_jni.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/unguessable_token_android.h"
 #include "base/logging.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/common/gpu_surface_tracker.h"
 #include "jni/ChildProcessLauncher_jni.h"
 #include "media/base/android/media_player_android.h"
 #include "ui/gl/android/surface_texture.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ToJavaArrayOfStrings;
@@ skipping 62 matching lines @@
 // |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*,
                                   const JavaParamRef<jclass>&,
                                   jlong client_context,
                                   jint handle) {
   StartChildProcessCallback* callback =
       reinterpret_cast<StartChildProcessCallback*>(client_context);
-  if (handle)
-    callback->Run(static_cast<base::ProcessHandle>(handle));
+  int launch_result = (handle == base::kNullProcessHandle)
+                      ? LAUNCH_RESULT_FAILURE
+                      : LAUNCH_RESULT_SUCCESS;
+  callback->Run(static_cast<base::ProcessHandle>(handle), launch_result);
   delete callback;
 }
 
 void StartChildProcess(
     const base::CommandLine::StringVector& argv,
     int child_process_id,
-    std::unique_ptr<content::FileDescriptorInfo> files_to_register,
+    content::FileDescriptorInfo* files_to_register,
     const StartChildProcessCallback& callback) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   // Create the Command line String[]
   ScopedJavaLocalRef<jobjectArray> j_argv = ToJavaArrayOfStrings(env, argv);
 
   size_t file_count = files_to_register->GetMappingSize();
   DCHECK(file_count > 0);
 
   ScopedJavaLocalRef<jclass> j_file_info_class = base::android::GetClass(
       env, "org/chromium/content/common/FileDescriptorInfo");
   ScopedJavaLocalRef<jobjectArray> j_file_infos(
       env, env->NewObjectArray(file_count, j_file_info_class.obj(), NULL));
   base::android::CheckException(env);
 
   for (size_t i = 0; i < file_count; ++i) {
     int fd = files_to_register->GetFDAt(i);
     PCHECK(0 <= fd);
     int id = files_to_register->GetIDAt(i);
+    auto region = files_to_register->GetRegionAt(i);

[boliu, 2017/01/12 02:00:07]

I'm no c++11 expert, but I think this should be "const auto& region"

[Jay Civelli, 2017/01/12 23:05:40]

Done.

     bool auto_close = files_to_register->OwnsFD(fd);
-    const base::MemoryMappedFile::Region& region =
-        files_to_register->GetRegionAt(i);
-    int64_t offset = region.offset;
-    int64_t size = region.size;
     ScopedJavaLocalRef<jobject> j_file_info =
-        Java_ChildProcessLauncher_makeFdInfo(env, id, fd, auto_close, offset,
-                                             size);
+        Java_ChildProcessLauncher_makeFdInfo(env, id, fd, auto_close,
+            region.offset, region.size);
     PCHECK(j_file_info.obj());
     env->SetObjectArrayElement(j_file_infos.obj(), i, j_file_info.obj());
     if (auto_close) {
       ignore_result(files_to_register->ReleaseFD(fd).release());
     }
   }
 
   Java_ChildProcessLauncher_start(
       env, base::android::GetApplicationContext(), j_argv, child_process_id,
       j_file_infos,
@@ skipping 68 matching lines @@
   gl::ScopedJavaSurface surface_view =
       gpu::GpuSurfaceTracker::GetInstance()->AcquireJavaSurface(surface_id);
   return base::android::ScopedJavaLocalRef<jobject>(surface_view.j_surface());
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content