Unifying ChildProcessLauncher across platforms.

content/browser/android/child_process_launcher_android_jni.h

Index: content/browser/android/child_process_launcher_android_jni.h
diff --git a/content/browser/android/child_process_launcher_android.h b/content/browser/android/child_process_launcher_android_jni.h
similarity index 58%
rename from content/browser/android/child_process_launcher_android.h
rename to content/browser/android/child_process_launcher_android_jni.h
index 78f088a6c5a743fb4e8a83e4aa8dd6e89c264bab..d7f9ef26843e97a5b779be102ac4df4da98b9159 100644
--- a/content/browser/android/child_process_launcher_android.h
+++ b/content/browser/android/child_process_launcher_android_jni.h
@@ -1,46 +1,45 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+

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

nit: empty line

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

Done.

+// Copyright (c) 2016 The Chromium Authors. All rights reserved.

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

cc file didn't have year updated, but header did?

If updating year, also remove (c)

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

Keeping year as is, the file has been renamed with limited changes.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
-#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
+#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_JNI_H_
+#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_JNI_H_
 
 #include <jni.h>
 
-#include <map>
-#include <memory>
-
-#include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/files/memory_mapped_file.h"
 #include "base/process/process.h"
 #include "content/public/browser/file_descriptor_info.h"
-#include "ui/gl/android/scoped_java_surface.h"
 
+// Contains the methods either being called from or calling to
+// ChildProcessLauncher.java.
 namespace content {
 
-typedef base::Callback<void(base::ProcessHandle)> StartChildProcessCallback;
-// Starts a process as a child process spawned by the Android
-// ActivityManager.
+
+typedef base::Callback<void(base::ProcessHandle, int /* launch result */)>
+    StartChildProcessCallback;
+
+// Starts a process as a child process spawned by the Android ActivityManager.
 // The created process handle is returned to the |callback| on success, 0 is
 // returned if the process could not be created.
 void StartChildProcess(
     const base::CommandLine::StringVector& argv,
     int child_process_id,
-    const std::unique_ptr<FileDescriptorInfo> files_to_register,
+    FileDescriptorInfo* files_to_register,
     const StartChildProcessCallback& callback);
 
-// Stops a child process based on the handle returned form
-// StartChildProcess.
+// Stops a child process based on the handle returned from StartChildProcess.
 void StopChildProcess(base::ProcessHandle handle);
 
 bool IsChildProcessOomProtected(base::ProcessHandle handle);
 
 void SetChildProcessInForeground(base::ProcessHandle handle,
                                  bool in_foreground);
+
 bool RegisterChildProcessLauncher(JNIEnv* env);
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
+#endif  // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_JNI_H_