Fix x86 build of Android.

After https://chromiumcodereview.appspot.com/12321131/ there are two copies of child_process_launcher.cc
content/browser/android and in content/browser. Rename the former to avoid having duplicate basenames
which is a problem for some toolchains. This wasn't seen in chromium as there isn't coverage for x86.

BUG=178382
TBR=joth,jam


Review URL: https://chromiumcodereview.appspot.com/12575010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188970 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 36 insertions, 0 deletions

diff --git a/content/browser/android/child_process_launcher_android.h b/content/browser/android/child_process_launcher_android.h
new file mode 100644
index 0000000..e83e04e
--- /dev/null
+++ b/content/browser/android/child_process_launcher_android.h
@@ -0,0 +1,36 @@
+// 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.
+
+#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
+#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
+
+#include <jni.h>
+
+#include "base/callback.h"
+#include "base/command_line.h"
+#include "base/platform_file.h"
+#include "base/process.h"
+#include "content/public/browser/file_descriptor_info.h"
+
+namespace content {
+
+typedef base::Callback<void(base::ProcessHandle)> 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
+// retuned if the process could not be created.
+void StartChildProcess(
+    const CommandLine::StringVector& argv,
+    const std::vector<FileDescriptorInfo>& files_to_register,
+    const StartChildProcessCallback& callback);
+
+// Stops a child process based on the handle returned form
+// StartChildProcess.
+void StopChildProcess(base::ProcessHandle handle);
+
+bool RegisterChildProcessLauncher(JNIEnv* env);
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_