Fix Task Manager to correctly display network usage of plug-in processes.

chrome/browser/task_manager/task_manager_resource_providers.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 "chrome/browser/task_manager/task_manager_resource_providers.h"
 
 #include "build/build_config.h"
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
@@ skipping 216 matching lines @@
 }
 
 TaskManagerTabContentsResourceProvider::
     ~TaskManagerTabContentsResourceProvider() {
 }
 
 TaskManager::Resource* TaskManagerTabContentsResourceProvider::GetResource(
     int origin_pid,
     int render_process_host_id,
     int routing_id) {
-
   TabContents* tab_contents =
       tab_util::GetTabContentsByID(render_process_host_id, routing_id);
   if (!tab_contents)  // Not one of our resource.
     return NULL;
 
-  base::ProcessHandle process_handle =
-      tab_contents->GetRenderProcessHost()->GetHandle();
-  if (!process_handle) {
-    // We should not be holding on to a dead tab (it should have been removed
-    // through the NOTIFY_TAB_CONTENTS_DISCONNECTED notification.
-    NOTREACHED();
-    return NULL;
-  }
-
-  int pid = base::GetProcId(process_handle);
-  if (pid != origin_pid)
+  // If an origin PID was specified then the request originated in a plugin
+  // working on the TabContent's behalf, so ignore it.
+  if (origin_pid)
     return NULL;
 
   std::map<TabContents*, TaskManagerTabContentsResource*>::iterator
       res_iter = resources_.find(tab_contents);
   if (res_iter == resources_.end()) {
     // Can happen if the tab was closed while a network request was being
     // performed.
     return NULL;
   }
   return res_iter->second;
@@ skipping 182 matching lines @@
 
 TaskManagerBackgroundContentsResourceProvider::
     ~TaskManagerBackgroundContentsResourceProvider() {
 }
 
 TaskManager::Resource*
 TaskManagerBackgroundContentsResourceProvider::GetResource(
     int origin_pid,
     int render_process_host_id,
     int routing_id) {
-
   BackgroundContents* contents = BackgroundContents::GetBackgroundContentsByID(
       render_process_host_id, routing_id);
   if (!contents)  // This resource no longer exists.
     return NULL;
 
-  base::ProcessHandle process_handle =
-      contents->render_view_host()->process()->GetHandle();
-  if (!process_handle) // Process crashed.
-    return NULL;
-
-  int pid = base::GetProcId(process_handle);
-  if (pid != origin_pid)
+  // If an origin PID was specified, the request is from a plugin, not the
+  // render view host process
+  if (origin_pid)
     return NULL;
 
   std::map<BackgroundContents*,
       TaskManagerBackgroundContentsResource*>::iterator res_iter =
       resources_.find(contents);
   if (res_iter == resources_.end())
     // Can happen if the page went away while a network request was being
     // performed.
     return NULL;
 
@@ skipping 156 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 SkBitmap* TaskManagerChildProcessResource::default_icon_ = NULL;
 
 TaskManagerChildProcessResource::TaskManagerChildProcessResource(
     const ChildProcessInfo& child_proc)
     : child_process_(child_proc),
       title_(),
       network_usage_support_(false) {
   // We cache the process id because it's not cheap to calculate, and it won't
   // be available when we get the plugin disconnected notification.
-  pid_ = child_proc.id();
+  pid_ = child_proc.pid();
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
     // TODO(jabdelmalek): use different icon for web workers.
   }
 }
 
 TaskManagerChildProcessResource::~TaskManagerChildProcessResource() {
 }
 
@@ skipping 557 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerBrowserProcessResource class
 ////////////////////////////////////////////////////////////////////////////////
 
 SkBitmap* TaskManagerBrowserProcessResource::default_icon_ = NULL;
 
 TaskManagerBrowserProcessResource::TaskManagerBrowserProcessResource()
     : title_() {
-  pid_ = base::GetCurrentProcId();
-  bool success = base::OpenPrivilegedProcessHandle(pid_, &process_);
+  int pid = base::GetCurrentProcId();
+  bool success = base::OpenPrivilegedProcessHandle(pid, &process_);
   DCHECK(success);
 #if defined(OS_WIN)
   if (!default_icon_) {
     HICON icon = GetAppIcon();
     if (icon) {
       ICONINFO icon_info = {0};
       BITMAP bitmap_info = {0};
 
       GetIconInfo(icon, &icon_info);
       GetObject(icon_info.hbmMask, sizeof(bitmap_info), &bitmap_info);
@@ skipping 70 matching lines @@
 }
 
 TaskManagerBrowserProcessResourceProvider::
     ~TaskManagerBrowserProcessResourceProvider() {
 }
 
 TaskManager::Resource* TaskManagerBrowserProcessResourceProvider::GetResource(
     int origin_pid,
     int render_process_host_id,
     int routing_id) {
-  if (origin_pid != resource_.process_id()) {
+  if (origin_pid || render_process_host_id != -1) {
     return NULL;
   }
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }