Refactor the guts of ResourceDispatcherHostImpl into a new class named

content/browser/renderer_host/resource_request_info_impl.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 "content/browser/renderer_host/resource_request_info_impl.h"
 
-#include "content/browser/renderer_host/doomed_resource_handler.h"
-#include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/net/url_request_user_data.h"
-#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
+#include "content/public/browser/global_request_id.h"
 #include "net/url_request/url_request.h"
 #include "webkit/blob/blob_data.h"
 
 namespace content {
 
 // ----------------------------------------------------------------------------
 // ResourceRequestInfo
 
 // static
 const ResourceRequestInfo* ResourceRequestInfo::ForRequest(
     const net::URLRequest* request) {
   return ResourceRequestInfoImpl::ForRequest(request);
 }
 
 // static
 void ResourceRequestInfo::AllocateForTesting(
     net::URLRequest* request,
     ResourceType::Type resource_type,
     ResourceContext* context) {
   ResourceRequestInfoImpl* info =
       new ResourceRequestInfoImpl(
-          scoped_ptr<ResourceHandler>(),     // handler
           PROCESS_TYPE_RENDERER,             // process_type
           -1,                                // child_id
           MSG_ROUTING_NONE,                  // route_id
           0,                                 // origin_pid
           0,                                 // request_id
           resource_type == ResourceType::MAIN_FRAME,  // is_main_frame
           0,                                 // frame_id
           false,                             // parent_is_main_frame
           0,                                 // parent_frame_id
           resource_type,                     // resource_type
@@ skipping 30 matching lines @@
   return static_cast<ResourceRequestInfoImpl*>(request->GetUserData(NULL));
 }
 
 // static
 const ResourceRequestInfoImpl* ResourceRequestInfoImpl::ForRequest(
     const net::URLRequest* request) {
   return ForRequest(const_cast<net::URLRequest*>(request));
 }
 
 ResourceRequestInfoImpl::ResourceRequestInfoImpl(
-    scoped_ptr<ResourceHandler> handler,
     ProcessType process_type,
     int child_id,
     int route_id,
     int origin_pid,
     int request_id,
     bool is_main_frame,
     int64 frame_id,
     bool parent_is_main_frame,
     int64 parent_frame_id,
     ResourceType::Type resource_type,
     PageTransition transition_type,
     uint64 upload_size,
     bool is_download,
     bool allow_download,
     bool has_user_gesture,
     WebKit::WebReferrerPolicy referrer_policy,
     ResourceContext* context)
-    : resource_handler_(handler.Pass()),
-      cross_site_handler_(NULL),
+    : cross_site_handler_(NULL),
       process_type_(process_type),
       child_id_(child_id),
       route_id_(route_id),
       origin_pid_(origin_pid),
       request_id_(request_id),
       is_main_frame_(is_main_frame),
       frame_id_(frame_id),
       parent_is_main_frame_(parent_is_main_frame),
       parent_frame_id_(parent_frame_id),
       pending_data_count_(0),
       is_download_(is_download),
       allow_download_(allow_download),
       has_user_gesture_(has_user_gesture),
-      pause_count_(0),
       resource_type_(resource_type),
       transition_type_(transition_type),
       upload_size_(upload_size),
-      last_upload_position_(0),
-      waiting_for_upload_progress_ack_(false),
       memory_cost_(0),
       referrer_policy_(referrer_policy),
-      context_(context),
-      is_paused_(false),
-      called_on_response_started_(false),
-      has_started_reading_(false),
-      paused_read_bytes_(0) {
+      context_(context) {
 }
 
 ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
-  // Run ResourceHandler destructor before we tear-down the rest of our state
-  // as the ResourceHandler may want to inspect some of our other members.
-  resource_handler_.reset();
 }
 
 ResourceContext* ResourceRequestInfoImpl::GetContext() const {
   return context_;
 }
 
 int ResourceRequestInfoImpl::GetChildID() const {
   return child_id_;
 }
 
@@ skipping 62 matching lines @@
   request->SetUserData(NULL, this);
   int render_process_id;
   int render_view_id;
   if (GetAssociatedRenderView(&render_process_id, &render_view_id)) {
     request->SetUserData(
         URLRequestUserData::kUserDataKey,
         new URLRequestUserData(render_process_id, render_view_id));
   }
 }
 
-void ResourceRequestInfoImpl::InsertDoomedResourceHandler() {
-  resource_handler_.reset(
-      new DoomedResourceHandler(resource_handler_.Pass()));
-}
-
-void ResourceRequestInfoImpl::set_login_delegate(
-    ResourceDispatcherHostLoginDelegate* ld) {
-  login_delegate_ = ld;
-}
-
-void ResourceRequestInfoImpl::set_ssl_client_auth_handler(
-    SSLClientAuthHandler* s) {
-  ssl_client_auth_handler_ = s;
+GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
+  return GlobalRequestID(child_id_, request_id_);
 }
 
 void ResourceRequestInfoImpl::set_requested_blob_data(
     webkit_blob::BlobData* data) {
   requested_blob_data_ = data;
 }
 
 }  // namespace content