Use ForceShutdown to kill old GPU process.

content/browser/gpu/gpu_process_host.cc

 // Copyright (c) 2011 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/gpu/gpu_process_host.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 166 matching lines @@
 
   // The Gpu process is invalid if it's not using software, the card is
   // blacklisted, and we can kill it and start over.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) ||
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU) ||
       host->software_rendering() ||
       !GpuDataManager::GetInstance()->software_rendering()) {
     return true;
   }
 
-  host->Send(new GpuMsg_Crash());
-  g_hosts_by_id.Pointer()->Remove(host_id);
+  host->ForceShutdown();
   return false;
 }
 
 // static
 GpuProcessHost* GpuProcessHost::GetForRenderer(
     int renderer_id, content::CauseForGpuLaunch cause) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Don't grant further access to GPU if it is not allowed.
   GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance();
@@ skipping 338 matching lines @@
     // The gpu process is too unstable to use. Disable it for current session.
     gpu_enabled_ = false;
   }
   BrowserChildProcessHost::OnProcessCrashed(exit_code);
 }
 
 bool GpuProcessHost::software_rendering() {
   return software_rendering_;
 }
 
+void GpuProcessHost::ForceShutdown() {
+  g_hosts_by_id.Pointer()->Remove(host_id_);
+  BrowserChildProcessHost::ForceShutdown();
+}
+
 bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) {
   if (!gpu_enabled_ || g_gpu_crash_count >= kGpuMaxCrashCount) {
     SendOutstandingReplies();
     gpu_enabled_ = false;
     return false;
   }
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
 
   CommandLine::StringType gpu_launcher =
@@ skipping 86 matching lines @@
   scoped_ptr<EstablishChannelCallback> wrapped_callback(callback);
   wrapped_callback->Run(channel_handle, renderer_process_for_gpu, gpu_info);
 }
 
 void GpuProcessHost::CreateCommandBufferError(
     CreateCommandBufferCallback* callback, int32 route_id) {
   scoped_ptr<GpuProcessHost::CreateCommandBufferCallback>
     wrapped_callback(callback);
   callback->Run(route_id);
 }