Split net::UploadData into two: for IPC and for upload handling

content/browser/renderer_host/resource_dispatcher_host_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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 22 matching lines @@
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/async_resource_handler.h"
 #include "content/browser/renderer_host/buffered_resource_handler.h"
 #include "content/browser/renderer_host/cross_site_resource_handler.h"
 #include "content/browser/renderer_host/duplicate_content_resource_handler.h"
 #include "content/browser/renderer_host/redirect_to_file_resource_handler.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
-#include "content/browser/renderer_host/transfer_navigation_resource_throttle.h"
 #include "content/browser/renderer_host/resource_request_info_impl.h"
 #include "content/browser/renderer_host/sync_resource_handler.h"
 #include "content/browser/renderer_host/throttling_resource_handler.h"
+#include "content/browser/renderer_host/transfer_navigation_resource_throttle.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/resource_messages.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 19 matching lines @@
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/shareable_file_reference.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/resource_request_body.h"

[darin (slow to review), 2012/08/15 17:49:55]

nit: sort

[kinuko, 2012/08/16 08:14:59]

Done.

 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using webkit_blob::ShareableFileReference;
+using webkit_glue::ResourceRequestBody;
 
 // ----------------------------------------------------------------------------
 
 namespace content {
 
 namespace {
 
 static ResourceDispatcherHostImpl* g_resource_dispatcher_host;
 
 // The interval for calls to ResourceDispatcherHostImpl::UpdateLoadStates
@@ skipping 63 matching lines @@
       ChildProcessSecurityPolicyImpl::GetInstance();
 
   // Check if the renderer is permitted to request the requested URL.
   if (!policy->CanRequestURL(child_id, request_data.url)) {
     VLOG(1) << "Denied unauthorized request for "
             << request_data.url.possibly_invalid_spec();
     return false;
   }
 
   // Check if the renderer is permitted to upload the requested files.
-  if (request_data.upload_data) {
-    const std::vector<net::UploadData::Element>* uploads =
-        request_data.upload_data->elements();
-    std::vector<net::UploadData::Element>::const_iterator iter;
+  if (request_data.request_body) {
+    const std::vector<ResourceRequestBody::Element>* uploads =
+        request_data.request_body->elements();
+    std::vector<ResourceRequestBody::Element>::const_iterator iter;
     for (iter = uploads->begin(); iter != uploads->end(); ++iter) {
-      if (iter->type() == net::UploadData::TYPE_FILE &&
+      if (iter->type() == ResourceRequestBody::TYPE_FILE &&
           !policy->CanReadFile(child_id, iter->file_path())) {
         NOTREACHED() << "Denied unauthorized upload of "
                      << iter->file_path().value();
         return false;
       }
     }
   }
 
   return true;
 }
@@ skipping 702 matching lines @@
         return;
       }
     }
   }
 
   ResourceContext* resource_context = filter_->resource_context();
   // http://crbug.com/90971
   CHECK(ContainsKey(active_resource_contexts_, resource_context));
 
   // Might need to resolve the blob references in the upload data.
-  if (request_data.upload_data) {
+  if (request_data.request_body) {
     GetBlobStorageControllerForResourceContext(resource_context)->
-        ResolveBlobReferencesInUploadData(request_data.upload_data.get());
+        ResolveBlobReferencesInResourceRequestBody(
+            request_data.request_body.get());
   }
 
   if (is_shutdown_ ||
       !ShouldServiceRequest(process_type, child_id, request_data)) {
     AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id);
     return;
   }
 
   const Referrer referrer(MaybeStripReferrer(request_data.referrer),
                           request_data.referrer_policy);
@@ skipping 41 matching lines @@
 
   // TODO(darin): Do we really need all of these URLRequest setters in the
   // transferred navigation case?
 
   request->set_load_flags(load_flags);
 
   request->set_priority(DetermineRequestPriority(request_data.resource_type));
 
   // Set upload data.
   uint64 upload_size = 0;
-  if (request_data.upload_data) {
-    request->set_upload(request_data.upload_data);
+  if (request_data.request_body) {
+    scoped_refptr<net::UploadData> upload = new net::UploadData;
+    request_data.request_body->PopulateUploadData(upload.get());
+    request->set_upload(upload);
     // This results in performing file IO. crbug.com/112607.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    upload_size = request_data.upload_data->GetContentLengthSync();
+    upload_size = upload->GetContentLengthSync();
   }
 
   bool allow_download = request_data.allow_download &&
       ResourceType::IsFrame(request_data.resource_type);
 
   // Make extra info and read footer (contains request ID).
   ResourceRequestInfoImpl* extra_info =
       new ResourceRequestInfoImpl(
           process_type,
           child_id,
@@ skipping 749 matching lines @@
 
   return i->second.get();
 }
 
 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
                                                       int request_id) const {
   return GetLoader(GlobalRequestID(child_id, request_id));
 }
 
 }  // namespace content