Add Terminate() to the Process object, have RenderProcessHost use this to avo...

chrome/browser/task_manager_resource_providers.cc

 // Copyright (c) 2006-2008 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/task_manager_resource_providers.h"
 
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
@@ skipping 16 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerWebContentsResource class
 ////////////////////////////////////////////////////////////////////////////////
 
 TaskManagerWebContentsResource::TaskManagerWebContentsResource(
     WebContents* web_contents)
     : web_contents_(web_contents) {
   // We cache the process as when the WebContents is closed the process
   // becomes NULL and the TaskManager still needs it.
   process_ = web_contents_->process()->process().handle();
-  pid_ = process_util::GetProcId(process_);
+  pid_ = base::GetProcId(process_);
 }
 
 TaskManagerWebContentsResource::~TaskManagerWebContentsResource() {
 }
 
 std::wstring TaskManagerWebContentsResource::GetTitle() const {
   // GetTitle() and GetURL() can only be invoked when the WebContents has a
   // controller.
   if (!web_contents_->controller())
     return std::wstring();
@@ skipping 181 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerPluginProcessResource class
 ////////////////////////////////////////////////////////////////////////////////
 SkBitmap* TaskManagerPluginProcessResource::default_icon_ = NULL;
 
 TaskManagerPluginProcessResource::TaskManagerPluginProcessResource(
     PluginProcessInfo plugin_proc)
     : plugin_process_(plugin_proc),
       title_(),
       network_usage_support_(false) {
-  pid_ = process_util::GetProcId(plugin_proc.process());
+  pid_ = base::GetProcId(plugin_proc.process());
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
   }
 }
 
 TaskManagerPluginProcessResource::~TaskManagerPluginProcessResource() {
 }
 
 // TaskManagerResource methods:
@@ skipping 142 matching lines @@
 
   // Finally, delete the resource.
   delete resource;
 }
 
 void TaskManagerPluginProcessResourceProvider::AddToTaskManager(
     PluginProcessInfo plugin_process_info) {
   TaskManagerPluginProcessResource* resource =
       new TaskManagerPluginProcessResource(plugin_process_info);
   resources_[plugin_process_info] = resource;
-  pid_to_resources_[process_util::GetProcId(plugin_process_info.process())] =
+  pid_to_resources_[base::GetProcId(plugin_process_info.process())] =
       resource;
   task_manager_->AddResource(resource);
 }
 
 // The PluginProcessIterator has to be used from the IO thread.
 void TaskManagerPluginProcessResourceProvider::RetrievePluginProcessInfo() {
   for (PluginProcessHostIterator iter; !iter.Done(); ++iter) {
     PluginProcessHost* plugin = const_cast<PluginProcessHost*>(*iter);
     DCHECK(plugin->process());
     PluginProcessInfo plugin_info(plugin->dll_path(), plugin->process());
@@ skipping 89 matching lines @@
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }