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

chrome/browser/task_manager/task_manager.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.h"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/process_util.h"
@@ skipping 821 matching lines @@
   if (param.byte_count == 0) {
     // Nothing to do if no bytes were actually read.
     return;
   }
 
   // TODO(jcampan): this should be improved once we have a better way of
   // linking a network notification back to the object that initiated it.
   TaskManager::Resource* resource = NULL;
   for (ResourceProviderList::iterator iter = providers_.begin();
        iter != providers_.end(); ++iter) {
-    resource = (*iter)->GetResource(param.origin_child_id,
+    resource = (*iter)->GetResource(param.origin_pid,
                                     param.render_process_host_child_id,
                                     param.routing_id);
     if (resource)
       break;
   }
 
   if (resource == NULL) {
     // We can't match a resource to the notification.  That might mean the
     // tab that started a download was closed, or the request may have had
     // no originating resource associated with it in the first place.
     // We attribute orphaned/unaccounted activity to the Browser process.
-    int browser_pid = base::GetCurrentProcId();
-    CHECK(param.origin_child_id != browser_pid);
-    param.origin_child_id = browser_pid;
+    CHECK(param.origin_pid || (param.render_process_host_child_id != -1));
+    param.origin_pid = 0;
     param.render_process_host_child_id = param.routing_id = -1;
     BytesRead(param);
     return;
   }
 
   // We do support network usage, mark the resource as such so it can report 0
   // instead of N/A.
   if (!resource->SupportNetworkUsage())
     resource->SetSupportNetworkUsage();
 
@@ skipping 30 matching lines @@
   // Only net::URLRequestJob instances created by the ResourceDispatcherHost
   // have a render view associated.  All other jobs will have -1 returned for
   // the render process child and routing ids - the jobs may still match a
   // resource based on their origin id, otherwise BytesRead() will attribute
   // the activity to the Browser resource.
   int render_process_host_child_id = -1, routing_id = -1;
   ResourceDispatcherHost::RenderViewForRequest(job->request(),
                                                &render_process_host_child_id,
                                                &routing_id);
 
+  // Get the origin PID of the request's originator.  This will only be set for
+  // plugins - for renderer or browser initiated requests it will be zero.
+  int origin_pid =
+      chrome_browser_net::GetOriginPIDForRequest(job->request());
+
   // This happens in the IO thread, post it to the UI thread.
-  int origin_child_id =
-      chrome_browser_net::GetOriginProcessUniqueIDForRequest(job->request());
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this,
           &TaskManagerModel::BytesRead,
-          BytesReadParam(origin_child_id,
+          BytesReadParam(origin_pid,
           render_process_host_child_id,
           routing_id, byte_count)));
 }
 
 bool TaskManagerModel::GetProcessMetricsForRow(
     int row, base::ProcessMetrics** proc_metrics) const {
   DCHECK(row < ResourceCount());
   *proc_metrics = NULL;
 
   MetricsMap::const_iterator iter =
@@ skipping 112 matching lines @@
   MetricsMap::const_iterator iter = metrics_map_.find(handle);
   if (iter == metrics_map_.end())
     return false;
 
   if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
     return false;
 
   memory_usage_map_.insert(std::make_pair(handle, *usage));
   return true;
 }