Index: content/browser/child_process_launcher.cc |
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc |
index 1630fdda3c4f891ec1cefd56848d833fbce09342..3af86f1d1577ec6bfdb9a2ee4a6249dc874a7aab 100644 |
--- a/content/browser/child_process_launcher.cc |
+++ b/content/browser/child_process_launcher.cc |
@@ -28,7 +28,7 @@ |
#include "content/browser/mach_broker_mac.h" |
#elif defined(OS_ANDROID) |
#include "base/android/jni_android.h" |
-#include "content/browser/android/sandboxed_process_launcher.h" |
+#include "content/browser/android/child_process_launcher.h" |
#elif defined(OS_POSIX) |
#include "base/memory/singleton.h" |
#include "content/browser/renderer_host/render_sandbox_host_linux.h" |
@@ -108,7 +108,7 @@ class ChildProcessLauncher::Context |
} |
#if defined(OS_ANDROID) |
- static void OnSandboxedProcessStarted( |
+ static void OnChildProcessStarted( |
// |this_object| is NOT thread safe. Only use it to post a task back. |
scoped_refptr<Context> this_object, |
BrowserThread::ID client_thread_id, |
@@ -182,8 +182,8 @@ class ChildProcessLauncher::Context |
GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, |
&files_to_register); |
- StartSandboxedProcess(cmd_line->argv(), files_to_register, |
- base::Bind(&ChildProcessLauncher::Context::OnSandboxedProcessStarted, |
+ StartChildProcess(cmd_line->argv(), files_to_register, |
+ base::Bind(&ChildProcessLauncher::Context::OnChildProcessStarted, |
this_object, client_thread_id)); |
#elif defined(OS_POSIX) |
@@ -336,7 +336,7 @@ class ChildProcessLauncher::Context |
base::ProcessHandle handle) { |
#if defined(OS_ANDROID) |
LOG(INFO) << "ChromeProcess: Stopping process with handle " << handle; |
- StopSandboxedProcess(handle); |
+ StopChildProcess(handle); |
#else |
base::Process process(handle); |
// Client has gone away, so just kill the process. Using exit code 0 |