Add ResourceRequestInfo.

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
===================================================================
--- chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(revision 124423)
+++ chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(working copy)
@@ -30,10 +30,10 @@
 #include "chrome/common/render_messages.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/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
+#include "content/public/browser/resource_request_info.h"
 #include "net/base/load_flags.h"
 #include "net/base/ssl_config_service.h"
 
@@ -44,6 +44,7 @@
 
 using content::BrowserThread;
 using content::ResourceDispatcherHostLoginDelegate;
+using content::ResourceRequestInfo;
 
 namespace {
 
@@ -213,8 +214,8 @@
   ChromeURLRequestUserData* user_data = ChromeURLRequestUserData::Get(request);
   if (user_data && user_data->is_prerender()) {
     int child_id, route_id;
-    if (ResourceDispatcherHost::RenderViewForRequest(
-            request, &child_id, &route_id)) {
+    if (ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
+            &child_id, &route_id)) {
       if (prerender_tracker_->TryCancel(
               child_id, route_id,
               prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED)) {
@@ -234,8 +235,8 @@
     return true;
 
   int child_id, route_id;
-  if (!ResourceDispatcherHost::RenderViewForRequest(
-          request, &child_id, &route_id)) {
+  if (!ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
+          &child_id, &route_id)) {
     NOTREACHED();
     return true;
   }
@@ -309,8 +310,7 @@
     IPC::Message::Sender* sender) {
   LoadTimingObserver::PopulateTimingInfo(request, response);
 
-  ResourceDispatcherHostRequestInfo* info =
-      resource_dispatcher_host_->InfoForRequest(request);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   if (request->url().SchemeIsSecure()) {
     const net::URLRequestContext* context = request->context();