Add ResourceRequestInfo.

chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc

Index: chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc
===================================================================
--- chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc	(revision 124423)
+++ chrome/browser/renderer_host/transfer_navigation_resource_throttle.cc	(working copy)
@@ -10,12 +10,13 @@
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/public/browser/render_view_host_delegate.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/common/referrer.h"
 
 using content::GlobalRequestID;
 using content::RenderViewHostDelegate;
+using content::ResourceRequestInfo;
 
 namespace {
 
@@ -25,7 +26,7 @@
                                   const content::Referrer& referrer,
                                   WindowOpenDisposition window_open_disposition,
                                   int64 frame_id,
-                                  const GlobalRequestID& request_id) {
+                                  const GlobalRequestID& global_request_id) {
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_id,
                                                render_view_id);
   if (!rvh)
@@ -36,8 +37,7 @@
     return;
 
   delegate->RequestTransferURL(
-      new_url, referrer,
-      window_open_disposition, frame_id, request_id);
+      new_url, referrer, window_open_disposition, frame_id, global_request_id);
 }
 
 }  // namespace
@@ -55,8 +55,7 @@
     bool* defer) {
   // TODO(darin): Move this logic into src/content.
 
-  ResourceDispatcherHostRequestInfo* info =
-      ResourceDispatcherHost::InfoForRequest(request_);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
 
   // If a toplevel request is redirecting across extension extents, we want to
   // switch processes. We do this by deferring the redirect and resuming the
@@ -69,9 +68,7 @@
           io_data->GetExtensionInfoMap()->extensions(),
           ExtensionURLInfo(request_->url()), ExtensionURLInfo(new_url))) {
     int render_process_id, render_view_id;
-    if (ResourceDispatcherHost::RenderViewForRequest(
-            request_, &render_process_id, &render_view_id)) {
-
+    if (info->GetAssociatedRenderView(&render_process_id, &render_view_id)) {
       GlobalRequestID global_id(info->child_id(), info->request_id());
       ResourceDispatcherHost::Get()->MarkAsTransferredNavigation(global_id,
                                                                  request_);