NOT FOR REVIEW: Aura on Android

content/browser/child_process_launcher.cc

 // Copyright 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/child_process_launcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
@@ skipping 52 matching lines @@
   // slower due to the rest of the browser initializing at the same time).
   static bool done_first_launch = false;
   if (done_first_launch) {
     UMA_HISTOGRAM_TIMES("MPArch.ChildProcessLaunchSubsequent", launch_time);
   } else {
     UMA_HISTOGRAM_TIMES("MPArch.ChildProcessLaunchFirst", launch_time);
     done_first_launch = true;
   }
 }
 
-#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,
                                   BrowserThread::ID client_thread_id,
                                   const base::TimeTicks begin_launch_time,
                                   base::ScopedFD ipcfd,
                                   base::ProcessHandle handle) {
   // This can be called on the launcher thread or UI thread.
   base::TimeDelta launch_time = base::TimeTicks::Now() - begin_launch_time;
   BrowserThread::PostTask(
@@ skipping 88 matching lines @@
   if (process_type != switches::kZygoteProcess) {
     cmd_line->AppendSwitch(::switches::kV8NativesPassedByFD);
     if (snapshot_pf != -1) {
       cmd_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
     }
   }
 #endif  // defined(V8_USE_EXTERNAL_STARTUP_DATA)
 #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]));
 
   // Android WebView runs in single process, ensure that we never get here
   // when running in single process mode.
   CHECK(!cmd_line->HasSwitch(switches::kSingleProcess));
 
   StartChildProcess(
       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.
 
 #if !defined(OS_MACOSX)
   if (use_zygote) {
     base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
         cmd_line->argv(), files_to_register.Pass(), process_type);
     process = base::Process(handle);
   } else
@@ skipping 73 matching lines @@
   BrowserThread::PostTask(client_thread_id, FROM_HERE,
                           base::Bind(callback,
                                      use_zygote,
                                      base::Passed(&process)));
 #endif  // !defined(OS_ANDROID)
 }
 
 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.
   process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
   // On POSIX, we must additionally reap the child.
 #if defined(OS_POSIX)
 #if !defined(OS_MACOSX)
   if (zygote) {
     // If the renderer was created via a zygote, we have to proxy the reaping
     // through the zygote process.
@@ skipping 10 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER);
 #if defined(OS_MACOSX)
   MachBroker* broker = MachBroker::GetInstance();
   mach_port_t task_port = broker->TaskForPid(process.Pid());
   if (task_port != TASK_NULL) {
     process.SetProcessBackgrounded(task_port, background);
   }
 #else
   process.SetProcessBackgrounded(background);
 #endif  // defined(OS_MACOSX)
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)
   SetChildProcessInForeground(process.Handle(), !background);
 #endif
 }
 
 }  // anonymous namespace
 
 ChildProcessLauncher::ChildProcessLauncher(
     SandboxedProcessLauncherDelegate* delegate,
     base::CommandLine* cmd_line,
     int child_process_id,
@@ skipping 73 matching lines @@
         GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
   } else if (known_dead) {
     termination_status_ =
         base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
   } else {
 #elif defined(OS_MACOSX)
   if (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 {
 #else
   {
 #endif
     termination_status_ =
       base::GetTerminationStatus(process_.Handle(), &exit_code_);
   }
 }
@@ skipping 115 matching lines @@
 }
 
 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
     Client* client) {
   Client* ret = client_;
   client_ = client;
   return ret;
 }
 
 }  // namespace content