Add ResourceRequestInfo.

chrome/browser/ui/login/login_prompt.cc

Index: chrome/browser/ui/login/login_prompt.cc
===================================================================
--- chrome/browser/ui/login/login_prompt.cc	(revision 124947)
+++ chrome/browser/ui/login/login_prompt.cc	(working copy)
@@ -17,11 +17,11 @@
 #include "chrome/common/chrome_notification_types.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_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host_delegate.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/auth.h"
@@ -35,6 +35,7 @@
 using content::BrowserThread;
 using content::NavigationController;
 using content::RenderViewHostDelegate;
+using content::ResourceRequestInfo;
 using content::WebContents;
 using webkit::forms::PasswordForm;
 
@@ -44,12 +45,7 @@
 // Should only be called from the IO thread, since it accesses an
 // net::URLRequest.
 void ResetLoginHandlerForRequest(net::URLRequest* request) {
-  ResourceDispatcherHostRequestInfo* info =
-      ResourceDispatcherHost::InfoForRequest(request);
-  if (!info)
-    return;
-
-  info->set_login_delegate(NULL);
+  ResourceDispatcherHost::ClearLoginDelegate(request);
 }
 
 // Get the signon_realm under which this auth info should be stored.
@@ -101,8 +97,8 @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&LoginHandler::AddObservers, this));
 
-  if (!ResourceDispatcherHost::RenderViewForRequest(
-          request_, &render_process_host_id_,  &tab_contents_id_)) {
+  if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView(
+          &render_process_host_id_,  &tab_contents_id_)) {
     NOTREACHED();
   }
 }