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 91 matching lines @@
             ipcfd,
 #endif
             cmd_line));
   }
 
 #if defined(OS_ANDROID)
   static void OnSandboxedProcessStarted(
       // |this_object| is NOT thread safe. Only use it to post a task back.
       scoped_refptr<Context> this_object,
       BrowserThread::ID client_thread_id,
+      const content::FDInfoList& registered_files,
       base::ProcessHandle handle) {
     if (BrowserThread::CurrentlyOn(client_thread_id)) {
       // This is always invoked on the UI thread which is commonly the
       // |client_thread_id| so we can shortcut one PostTask.
-      this_object->Notify(handle);
+      this_object->Notify(registered_files, handle);
     } else {
       BrowserThread::PostTask(
           client_thread_id, FROM_HERE,
           base::Bind(
               &ChildProcessLauncher::Context::Notify,
               this_object,
+              registered_files,
               handle));
     }
   }
 #endif
 
   void ResetClient() {
     // No need for locking as this function gets called on the same thread that
     // client_ would be used.
     CHECK(BrowserThread::CurrentlyOn(client_thread_id_));
     client_ = NULL;
@@ skipping 26 matching lines @@
 #endif
       CommandLine* cmd_line) {
     scoped_ptr<CommandLine> cmd_line_deleter(cmd_line);
 
 #if defined(OS_WIN)
     base::ProcessHandle handle = sandbox::StartProcessWithAccess(
         cmd_line, exposed_dir);
 #elif defined(OS_ANDROID)
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
-    std::vector<content::FileDescriptorInfo> files_to_register;
+    content::FDInfoList files_to_register;
     files_to_register.push_back(
         content::FileDescriptorInfo(kPrimaryIPCChannel,
                                     base::FileDescriptor(ipcfd, false)));
 
     content::GetContentClient()->browser()->
         GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
 
     content::StartSandboxedProcess(cmd_line->argv(), files_to_register,
         base::Bind(&ChildProcessLauncher::Context::OnSandboxedProcessStarted,
-                   this_object, client_thread_id));
+                   this_object, client_thread_id, files_to_register));
 
 #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<content::FileDescriptorInfo> files_to_register;
+    content::FDInfoList files_to_register;
     files_to_register.push_back(
         content::FileDescriptorInfo(kPrimaryIPCChannel,
                                     base::FileDescriptor(ipcfd, false)));
 
 #if !defined(OS_MACOSX)
     content::GetContentClient()->browser()->
         GetAdditionalMappedFilesForChildProcess(*cmd_line, &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<content::FileDescriptorInfo>::const_iterator
-           i = files_to_register.begin(); i != files_to_register.end(); ++i) {
+      for (content::FDInfoList::const_iterator i = files_to_register.begin();

[jam, 2012/10/19 16:39:17]

nit: no need for const_iterator when iterating a vector; a
size_t i = 0; i < files_to_register.size(); ++i 
is more readable..

[Jay Civelli, 2012/10/22 22:09:48]

Done.

+           i != files_to_register.end(); ++i) {
         const content::FileDescriptorInfo& fd_info = *i;
         fds_to_map.push_back(std::make_pair(
             fd_info.fd.fd,
             fd_info.id + base::GlobalDescriptors::kBaseDescriptor));
       }
 
 #if !defined(OS_MACOSX)
       if (process_type == switches::kRendererProcess) {
         const int sandbox_fd =
             RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
@@ skipping 41 matching lines @@
 #endif  // else defined(OS_POSIX)
 #if !defined(OS_ANDROID)
   BrowserThread::PostTask(
       client_thread_id, FROM_HERE,
       base::Bind(
           &Context::Notify,
           this_object.get(),
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
           use_zygote,
 #endif
+          files_to_register,
           handle));
 #endif  // !defined(OS_ANDROID)
   }
 
   void Notify(
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
       bool zygote,
 #endif
+      const content::FDInfoList& registered_files,
       base::ProcessHandle handle) {
 #if defined(OS_ANDROID)
     // Finally close the ipcfd
     file_util::ScopedFD ipcfd_closer(&ipcfd_);
 #endif
     starting_ = false;
     process_.set_handle(handle);
     if (!handle)
       LOG(ERROR) << "Failed to launch child process";
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
     zygote_ = zygote;
 #endif
     if (client_) {
-      client_->OnProcessLaunched();
+      client_->OnProcessLaunched(registered_files);
     } else {
       Terminate();
     }
   }
 
   void Terminate() {
     if (!process_.handle())
       return;
 
     if (!terminate_child_on_shutdown_)
@@ skipping 145 matching lines @@
       base::Bind(
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }