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

chrome/browser/renderer_host/resource_dispatcher_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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 178 matching lines @@
 // sample values).
 std::vector<int> GetAllNetErrorCodes() {
   std::vector<int> all_error_codes;
 #define NET_ERROR(label, value) all_error_codes.push_back(-(value));
 #include "net/base/net_error_list.h"
 #undef NET_ERROR
   return all_error_codes;
 }
 
 #if defined(OS_WIN)
-#pragma warning (disable: 4748)
-#pragma optimize( "", off )
+#pragma warning(disable: 4748)
+#pragma optimize("", off)
 #endif
 
 // Temporary experiment to help track down http://crbug.com/68766.
 // This should crash if called with an invalid ChromeURLRequestContext.
 // TODO(eroman): Delete this when experiment is complete.
 void CheckContextForBug68766(net::URLRequestContext* context) {
   if (context)
     static_cast<ChromeURLRequestContext*>(context)->IsExternal();
 }
 
 #if defined(OS_WIN)
-#pragma optimize( "", on )
-#pragma warning (default: 4748)
+#pragma optimize("", on)
+#pragma warning(default: 4748)
 #endif
 
 }  // namespace
 
 ResourceDispatcherHost::ResourceDispatcherHost()
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           download_file_manager_(new DownloadFileManager(this))),
       download_request_limiter_(new DownloadRequestLimiter()),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           save_file_manager_(new SaveFileManager(this))),
@@ skipping 297 matching lines @@
           request_data.resource_type,
           upload_size,
           false,  // is download
           ResourceType::IsFrame(request_data.resource_type),  // allow_download
           request_data.has_user_gesture,
           request_data.host_renderer_id,
           request_data.host_render_view_id);
   ApplyExtensionLocalizationFilter(request_data.url, request_data.resource_type,
                                    extra_info);
   SetRequestInfo(request, extra_info);  // Request takes ownership.
+
+  // Determine and store the child ID of the request originator
+  // If we can't find an originator then we fall back to the ID of the
+  // render process through which the request was received.

[awong, 2011/01/27 21:03:07]

drive-by style nit.

Add a newline before the TODO.  So 

// render process through which the request was received.
//
// TODO(wez): This lookup is too expensive - need a FromPID()...

+  // TODO(wez): This lookup is too expensive - need a FromPID()...
+  int origin_child_id = child_id;
+  for (BrowserChildProcessHost::Iterator i; !i.Done(); ++i) {

[brettw, 2011/01/27 21:23:51]

I don't think this approach is a good idea. It's both slow, not guaranteed to be
correct, and just kind of a huge hack.

+    base::ProcessHandle process_handle = (*i)->handle();
+    int pid = base::GetProcId(process_handle);
+    if (pid == request_data.origin_pid) {
+      origin_child_id = (*i)->id();
+      break;
+    }
+  }
   chrome_browser_net::SetOriginProcessUniqueIDForRequest(
-      request_data.origin_child_id, request);
+      origin_child_id, request);
 
   if (request->url().SchemeIs(chrome::kBlobScheme) && context) {
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
     webkit_blob::BlobStorageController* controller =
         context->blob_storage_context()->controller();
     extra_info->set_requested_blob_data(
         controller->GetBlobDataFromUrl(request->url()));
   }
 
@@ skipping 1408 matching lines @@
   return is_prefetch_enabled_;
 }
 
 // static
 void ResourceDispatcherHost::set_is_prefetch_enabled(bool value) {
   is_prefetch_enabled_ = value;
 }
 
 // static
 bool ResourceDispatcherHost::is_prefetch_enabled_ = false;