NOT FOR REVIEW: Aura on Android

content/browser/child_process_launcher.cc

Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 0abbc60cc3b654fba90ea5fe8f7c2051d55768e1..35b8ba0b7c8e621b8854027f5e86e62c10d32557 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -70,7 +70,7 @@ void RecordHistogramsOnLauncherThread(base::TimeDelta launch_time) {
   }
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)

[no sievers, 2015/10/20 19:24:23]

remove

 // TODO(sievers): Remove this by defining better what happens on what
 // thread in the corresponding Java code.
 void OnChildProcessStartedAndroid(const NotifyCallback& callback,
@@ -179,6 +179,7 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_ANDROID)
+//#if !defined(USE_AURA)
   files_to_register->Share(
       kAndroidICUDataDescriptor,
       base::i18n::GetIcuDataFileHandle(&regions[kAndroidICUDataDescriptor]));
@@ -191,7 +192,7 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
       cmd_line->argv(), child_process_id, files_to_register.Pass(), regions,
       base::Bind(&OnChildProcessStartedAndroid, callback, client_thread_id,
                  begin_launch_time, base::Passed(&ipcfd)));
-
+//#endif
 #elif defined(OS_POSIX)
   // We need to close the client end of the IPC channel to reliably detect
   // child termination.
@@ -285,9 +286,11 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,
 void TerminateOnLauncherThread(bool zygote, base::Process process) {
   DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER);
 #if defined(OS_ANDROID)
+//#if !defined(USE_AURA)

[no sievers, 2015/10/20 19:24:23]

We should keep the StopChildProcess() call.

   VLOG(1) << "ChromeProcess: Stopping process with handle "
           << process.Handle();
   StopChildProcess(process.Handle());
+//#endif
 #else
   // Client has gone away, so just kill the process.  Using exit code 0
   // means that UMA won't treat this as a crash.
@@ -318,7 +321,7 @@ void SetProcessBackgroundedOnLauncherThread(base::Process process,
 #else
   process.SetProcessBackgrounded(background);
 #endif  // defined(OS_MACOSX)
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)
   SetChildProcessInForeground(process.Handle(), !background);
 #endif
 }
@@ -412,7 +415,7 @@ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
     termination_status_ =
         base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
   } else {
-#elif defined(OS_ANDROID)
+#elif defined(OS_ANDROID)// && !defined(USE_AURA)
   if (IsChildProcessOomProtected(process_.Handle())) {
     termination_status_ = base::TERMINATION_STATUS_OOM_PROTECTED;
   } else {