Close leaking FDs.

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 148 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);
-    base::GlobalDescriptors::Mapping files_to_register;
-    files_to_register.push_back(std::pair<base::GlobalDescriptors::Key, int>(
-        kPrimaryIPCChannel, ipcfd));
+    std::vector<content::FileDescriptorInfo> 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(),
-        ipcfd, files_to_register,
+    content::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.
+    // 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);
-    base::GlobalDescriptors::Mapping files_to_register;
-    files_to_register.push_back(std::pair<base::GlobalDescriptors::Key, int>(
-        kPrimaryIPCChannel, ipcfd));
+    std::vector<content::FileDescriptorInfo> 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 (size_t i = 0; i < files_to_register.size(); ++i) {
-        const base::GlobalDescriptors::KeyFDPair& id_file =
-            files_to_register[i];
+      for (std::vector<content::FileDescriptorInfo>::const_iterator
+           i = files_to_register.begin(); i != files_to_register.end(); ++i) {
+        const content::FileDescriptorInfo& fd_info = *i;
         fds_to_map.push_back(std::make_pair(
-            id_file.second,
-            id_file.first + base::GlobalDescriptors::kBaseDescriptor));
+            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();
         fds_to_map.push_back(std::make_pair(
             sandbox_fd,
             kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
       }
@@ skipping 225 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);
 }