Merge 73639 - Adding crash reporting on Linux for the GPU process....

chrome/browser/child_process_launcher.cc

 // Copyright (c) 2010 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 "chrome/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 122 matching lines @@
 
 #if defined(OS_LINUX)
       // On Linux, we need to add some extra file descriptors for crash handling
       // and the sandbox.
       bool is_renderer =
           cmd_line->GetSwitchValueASCII(switches::kProcessType) ==
           switches::kRendererProcess;
       bool is_plugin =
           cmd_line->GetSwitchValueASCII(switches::kProcessType) ==
           switches::kPluginProcess;
+      bool is_gpu =
+          cmd_line->GetSwitchValueASCII(switches::kProcessType) ==
+          switches::kGpuProcess;
 
-      if (is_renderer || is_plugin) {
+      if (is_renderer || is_plugin || is_gpu) {
         int crash_signal_fd;
         if (is_renderer) {
           crash_signal_fd = RendererCrashHandlerHostLinux::GetInstance()->
               GetDeathSignalSocket();
+        } else if (is_plugin) {
+          crash_signal_fd = PluginCrashHandlerHostLinux::GetInstance()->
+              GetDeathSignalSocket();
         } else {
-          crash_signal_fd = PluginCrashHandlerHostLinux::GetInstance()->
+          crash_signal_fd = GpuCrashHandlerHostLinux::GetInstance()->
               GetDeathSignalSocket();
         }
         if (crash_signal_fd >= 0) {
           fds_to_map.push_back(std::make_pair(
               crash_signal_fd,
               kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor));
         }
       }
       if (is_renderer) {
         const int sandbox_fd =
@@ skipping 172 matching lines @@
   if (status != base::TERMINATION_STATUS_STILL_RUNNING)
     context_->process_.Close();
 
   return status;
 }
 
 void ChildProcessLauncher::SetProcessBackgrounded(bool background) {
   DCHECK(!context_->starting_);
   context_->process_.SetProcessBackgrounded(background);
 }