Add ResourceRequestInfo.

chrome/browser/automation/url_request_automation_job.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.
 
 #include "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #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"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_context.h"
 
 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.
 static const char* const kFilteredHeaderStrings[] = {
   "connection",
   "cookie",
   "expect",
   "max-forwards",
   "proxy-authorization",
   "referer",
@@ skipping 54 matching lines @@
 }
 
 net::URLRequestJob* URLRequestAutomationJob::Factory(
     net::URLRequest* request,
     const std::string& scheme) {
   bool scheme_is_http = request->url().SchemeIs("http");
   bool scheme_is_https = request->url().SchemeIs("https");
 
   // 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;
       }
     }
 
     if (scheme_is_http && old_http_factory_)
       return old_http_factory_(request, scheme);
     else if (scheme_is_https && old_https_factory_)
       return old_https_factory_(request, scheme);
   }
@@ skipping 104 matching lines @@
   *http_status_code = redirect_status_;
   *location = GURL(redirect_url_);
   return true;
 }
 
 uint64 URLRequestAutomationJob::GetUploadProgress() const {
   if (request_ && request_->status().is_success()) {
     // 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;
 }
 
 net::HostPortPair URLRequestAutomationJob::GetSocketAddress() const {
   return socket_address_;
 }
 
 bool URLRequestAutomationJob::MayFilterMessage(const IPC::Message& message,
@@ skipping 188 matching lines @@
 
   // The referrer header must be suppressed if the preceding URL was
   // a secure one and the new one is not.
   if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) {
     DVLOG(1) << "Suppressing referrer header since going from secure to "
                 "non-secure";
     referrer = GURL();
   }
 
   // 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.
   AutomationURLRequest automation_request;
   automation_request.url = request_->url().spec();
   automation_request.method = request_->method();
   automation_request.referrer = referrer.spec();
   automation_request.extra_request_headers = new_request_headers.ToString();
   automation_request.upload_data =request_->get_upload();
   automation_request.resource_type = resource_type;
@@ skipping 25 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }