Changing minidump process generation to be in-process on Android.

content/browser/child_process_launcher.cc

 // 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.
 
 #include "content/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 58 matching lines @@
 #if defined(OS_WIN)
       const FilePath& exposed_dir,
 #elif defined(OS_ANDROID)
       int ipcfd,
 #elif defined(OS_POSIX)
       bool use_zygote,
       const base::EnvironmentVector& environ,
       int ipcfd,
 #endif
       CommandLine* cmd_line,
+      int child_process_id,
       Client* client) {
     client_ = client;
 
     CHECK(BrowserThread::GetCurrentThreadIdentifier(&client_thread_id_));
 
 #if defined(OS_ANDROID)
     // We need to close the client end of the IPC channel to reliably detect
     // child termination. We will close this fd after we create the child
     // process which is asynchronous on Android.
     ipcfd_ = ipcfd;
 #endif
     BrowserThread::PostTask(
         BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
         base::Bind(
             &Context::LaunchInternal,
             make_scoped_refptr(this),
             client_thread_id_,
+            child_process_id,
 #if defined(OS_WIN)
             exposed_dir,
 #elif defined(OS_ANDROID)
             ipcfd,
 #elif defined(OS_POSIX)
             use_zygote,
             environ,
             ipcfd,
 #endif
             cmd_line));
@@ skipping 36 matching lines @@
   friend class ChildProcessLauncher;
 
   ~Context() {
     Terminate();
   }
 
   static void LaunchInternal(
       // |this_object| is NOT thread safe. Only use it to post a task back.
       scoped_refptr<Context> this_object,
       BrowserThread::ID client_thread_id,
+      int child_process_id,
 #if defined(OS_WIN)
       const FilePath& exposed_dir,
 #elif defined(OS_ANDROID)
       int ipcfd,
 #elif defined(OS_POSIX)
       bool use_zygote,
       const base::EnvironmentVector& env,
       int ipcfd,
 #endif
       CommandLine* cmd_line) {
     scoped_ptr<CommandLine> cmd_line_deleter(cmd_line);
 
 #if defined(OS_WIN)
     base::ProcessHandle handle = content::StartProcessWithAccess(
         cmd_line, exposed_dir);
 #elif defined(OS_ANDROID)
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
     std::vector<FileDescriptorInfo> files_to_register;
     files_to_register.push_back(
         FileDescriptorInfo(kPrimaryIPCChannel,
                                     base::FileDescriptor(ipcfd, false)));
 
     GetContentClient()->browser()->
-        GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
+        GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
+                                                &files_to_register);
 
     StartSandboxedProcess(cmd_line->argv(), files_to_register,
         base::Bind(&ChildProcessLauncher::Context::OnSandboxedProcessStarted,
                    this_object, client_thread_id));
 
 #elif defined(OS_POSIX)
     base::ProcessHandle handle = base::kNullProcessHandle;
     // We need to close the client end of the IPC channel to reliably detect
     // child termination.
     file_util::ScopedFD ipcfd_closer(&ipcfd);
 
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
     std::vector<FileDescriptorInfo> files_to_register;
     files_to_register.push_back(
         FileDescriptorInfo(kPrimaryIPCChannel,
                                     base::FileDescriptor(ipcfd, false)));
 
 #if !defined(OS_MACOSX)
     GetContentClient()->browser()->
-        GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
+        GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
+                                                &files_to_register);
     if (use_zygote) {
       handle = ZygoteHostImpl::GetInstance()->ForkRequest(cmd_line->argv(),
                                                           files_to_register,
                                                           process_type);
     } else
     // Fall through to the normal posix case below when we're not zygoting.
 #endif  // !defined(OS_MACOSX)
     {
       // Convert FD mapping to FileHandleMappingVector
       base::FileHandleMappingVector fds_to_map;
-      for (std::vector<FileDescriptorInfo>::const_iterator
-           i = files_to_register.begin(); i != files_to_register.end(); ++i) {
-        const FileDescriptorInfo& fd_info = *i;
+      for (size_t i = 0; i < files_to_register.size(); ++i) {
         fds_to_map.push_back(std::make_pair(
-            fd_info.fd.fd,
-            fd_info.id + base::GlobalDescriptors::kBaseDescriptor));
+            files_to_register[i].fd.fd,
+            files_to_register[i].id +
+                base::GlobalDescriptors::kBaseDescriptor));
       }
 
 #if !defined(OS_MACOSX)
       if (process_type == switches::kRendererProcess) {
         const int sandbox_fd =
             RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
         fds_to_map.push_back(std::make_pair(
             sandbox_fd,
             kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
       }
@@ skipping 148 matching lines @@
 
 ChildProcessLauncher::ChildProcessLauncher(
 #if defined(OS_WIN)
     const FilePath& exposed_dir,
 #elif defined(OS_POSIX)
     bool use_zygote,
     const base::EnvironmentVector& environ,
     int ipcfd,
 #endif
     CommandLine* cmd_line,
+    int child_process_id,
     Client* client) {
   context_ = new Context();
   context_->Launch(
 #if defined(OS_WIN)
       exposed_dir,
 #elif defined(OS_ANDROID)
       ipcfd,
 #elif defined(OS_POSIX)
       use_zygote,
       environ,
       ipcfd,
 #endif
       cmd_line,
+      child_process_id,
       client);
 }
 
 ChildProcessLauncher::~ChildProcessLauncher() {
   context_->ResetClient();
 }
 
 bool ChildProcessLauncher::IsStarting() {
   return context_->starting_;
 }
@@ skipping 46 matching lines @@
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
 
 }  // namespace content