Add ResourceRequestInfo.

ResourceRequestInfo exposes the members of ResourceDispatcherHostRequestInfo required by src/chrome.

ResourceDispatcherHostRequestInfo remains for use by src/content (maybe it should have a different name), and ResourceDispatcherHostRequestInfo subclasses ResourceRequestInfo.

ResourceDispatcherHost::RenderViewForRequest is removed in favor of ResourceRequestInfo::GetAssociatedRenderView().  src/chrome uses ResourceRequestInfo::ForRequest(URLRequest*) instead of ResourceDispatcherHost::InfoForRequest.

Deletes DummyResourceHandler in favor of just having ~ResourceDispatcherHostRequestInfo null-test its ResourceHandler.

R=jam@chromium.org
TBR=mirandac@chromium.org,ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9580002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125457 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 16 deletions

diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 231a4c5..8118483 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -10,10 +10,9 @@
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/common/automation_messages.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/render_view_host.h"
+#include "content/public/browser/resource_request_info.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
@@ -26,6 +25,7 @@
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
+using content::ResourceRequestInfo;
 
 // The list of filtered headers that are removed from requests sent via
 // StartAsync(). These must be lower case.
@@ -100,16 +100,15 @@ net::URLRequestJob* URLRequestAutomationJob::Factory(
 
   // Returning null here just means that the built-in handler will be used.
   if (scheme_is_http || scheme_is_https) {
-    ResourceDispatcherHostRequestInfo* request_info =
-        ResourceDispatcherHost::InfoForRequest(request);
-    if (request_info) {
-      int child_id = request_info->child_id();
-      int route_id = request_info->route_id();
+    const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
+    if (info) {
+      int child_id = info->GetChildID();
+      int route_id = info->GetRouteID();
       AutomationResourceMessageFilter::AutomationDetails details;
       if (AutomationResourceMessageFilter::LookupRegisteredRenderView(
               child_id, route_id, &details)) {
         URLRequestAutomationJob* job = new URLRequestAutomationJob(request,
-            details.tab_handle, request_info->request_id(), details.filter,
+            details.tab_handle, info->GetRequestID(), details.filter,
             details.is_pending_render_view);
         return job;
       }
@@ -234,10 +233,9 @@ uint64 URLRequestAutomationJob::GetUploadProgress() const {
     // We don't support incremental progress notifications in ChromeFrame. When
     // we receive a response for the POST request from Chromeframe, it means
     // that the upload is fully complete.
-    ResourceDispatcherHostRequestInfo* request_info =
-        ResourceDispatcherHost::InfoForRequest(request_);
-    if (request_info) {
-      return request_info->upload_size();
+    const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
+    if (info) {
+      return info->GetUploadSize();
     }
   }
   return 0;
@@ -446,11 +444,10 @@ void URLRequestAutomationJob::StartAsync() {
   }
 
   // Get the resource type (main_frame/script/image/stylesheet etc.
-  ResourceDispatcherHostRequestInfo* request_info =
-      ResourceDispatcherHost::InfoForRequest(request_);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   ResourceType::Type resource_type = ResourceType::MAIN_FRAME;
-  if (request_info) {
-    resource_type = request_info->resource_type();
+  if (info) {
+    resource_type = info->GetResourceType();
   }
 
   // Ask automation to start this request.