Add ResourceRequestInfo.

content/browser/renderer_host/resource_dispatcher_host.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 72 matching lines @@
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/shareable_file_reference.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 using content::GlobalRequestID;
 using content::ResourceContext;
+using content::ResourceRequestInfo;
 using content::ResourceResponse;
 using content::ResourceThrottle;
 using content::ThrottlingResourceHandler;
 using content::WebContents;
 using content::WorkerServiceImpl;
 using webkit_blob::ShareableFileReference;
 
 // ----------------------------------------------------------------------------
 
 namespace {
@@ skipping 1807 matching lines @@
     net::URLRequest* request) {
   // Avoid writing this function twice by casting the const version.
   const net::URLRequest* const_request = request;
   return const_cast<ResourceDispatcherHostRequestInfo*>(
       InfoForRequest(const_request));
 }
 
 // static
 const ResourceDispatcherHostRequestInfo* ResourceDispatcherHost::InfoForRequest(
     const net::URLRequest* request) {
-  const ResourceDispatcherHostRequestInfo* info =
-      static_cast<const ResourceDispatcherHostRequestInfo*>(
-          request->GetUserData(NULL));
-  return info;
+  return static_cast<const ResourceDispatcherHostRequestInfo*>(
+      ResourceRequestInfo::ForRequest(request));
 }
 
 // static
 bool ResourceDispatcherHost::RenderViewForRequest(
     const net::URLRequest* request,
-    int* render_process_host_id,
-    int* render_view_host_id) {
+    int* render_process_id,
+    int* render_view_id) {
   const ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
   if (!info) {
-    *render_process_host_id = -1;
-    *render_view_host_id = -1;
+    *render_process_id = -1;
+    *render_view_id = -1;
     return false;
   }
 
-  // If the request is from the worker process, find a tab that owns the worker.
-  if (info->process_type() == content::PROCESS_TYPE_WORKER) {
-    // Need to display some related UI for this network request - pick an
-    // arbitrary parent to do so.
-    if (!WorkerServiceImpl::GetInstance()->GetRendererForWorker(
-            info->child_id(), render_process_host_id, render_view_host_id)) {
-      *render_process_host_id = -1;
-      *render_view_host_id = -1;
-      return false;
-    }
-  } else {
-    *render_process_host_id = info->child_id();
-    *render_view_host_id = info->route_id();
-  }
-  return true;
+  return info->GetAssociatedRenderView(render_process_id, render_view_id);
 }
 
 net::URLRequest* ResourceDispatcherHost::GetURLRequest(
     const GlobalRequestID& request_id) const {
   // This should be running in the IO loop.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PendingRequestList::const_iterator i = pending_requests_.find(request_id);
   if (i == pending_requests_.end())
     return NULL;
@@ skipping 320 matching lines @@
   scoped_refptr<ResourceHandler> transferred_resource_handler(
       new DoomedResourceHandler(info->resource_handler()));
   info->set_resource_handler(transferred_resource_handler.get());
 }
 
 bool ResourceDispatcherHost::IsTransferredNavigation(
     const content::GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }