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

webkit/tools/test_shell/simple_resource_loader_bridge.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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 50 matching lines @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/blob/shareable_file_reference.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_dir_url_request_job.h"
 #include "webkit/fileapi/file_system_url_request_job.h"
 #include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/glue/resource_request_body.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
 #include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #include "crypto/nss_util.h"
 #endif
 
 using webkit_glue::ResourceLoaderBridge;
+using webkit_glue::ResourceRequestBody;
 using webkit_glue::ResourceResponseInfo;
 using net::StaticCookiePolicy;
 using net::HttpResponseHeaders;
 using webkit_blob::ShareableFileReference;
 
 namespace {
 
 struct TestShellRequestContextParams {
   TestShellRequestContextParams(
       const FilePath& in_cache_path,
@@ skipping 178 matching lines @@
   std::string method;
   GURL url;
   GURL first_party_for_cookies;
   GURL referrer;
   WebKit::WebReferrerPolicy referrer_policy;
   std::string headers;
   int load_flags;
   ResourceType::Type request_type;
   int appcache_host_id;
   bool download_to_file;
-  scoped_refptr<net::UploadData> upload;
+  scoped_refptr<ResourceRequestBody> request_body;
 };
 
 // The interval for calls to RequestProxy::MaybeUpdateUploadProgress
 static const int kUpdateUploadProgressIntervalMsec = 100;
 
 // The RequestProxy does most of its work on the IO thread.  The Start and
 // Cancel methods are proxied over to the IO thread, where an net::URLRequest
 // object is instantiated.
 struct DeleteOnIOThread;  // See below.
 class RequestProxy
@@ skipping 114 matching lines @@
   void NotifyUploadProgress(uint64 position, uint64 size) {
     if (peer_)
       peer_->OnUploadProgress(position, size);
   }
 
   // --------------------------------------------------------------------------
   // The following methods are called on the io thread.  They correspond to
   // actions performed on the owner's thread.
 
   void AsyncStart(RequestParams* params) {
-    // Might need to resolve the blob references in the upload data.
-    if (params->upload) {
-      static_cast<TestShellRequestContext*>(g_request_context)->
-          blob_storage_controller()->ResolveBlobReferencesInUploadData(
-              params->upload.get());
-    }
-
     request_.reset(new net::URLRequest(params->url, this, g_request_context));
     request_->set_method(params->method);
     request_->set_first_party_for_cookies(params->first_party_for_cookies);
     request_->set_referrer(params->referrer.spec());
     webkit_glue::ConfigureURLRequestForReferrerPolicy(
         request_.get(), params->referrer_policy);
     net::HttpRequestHeaders headers;
     headers.AddHeadersFromString(params->headers);
     request_->SetExtraRequestHeaders(headers);
     request_->set_load_flags(params->load_flags);
-    request_->set_upload(params->upload.get());
+    if (params->request_body) {
+      request_->set_upload(
+          params->request_body->ResolveElementsAndCreateUploadData(
+              static_cast<TestShellRequestContext*>(g_request_context)->
+                  blob_storage_controller()));
+    }
     SimpleAppCacheSystem::SetExtraRequestInfo(
         request_.get(), params->appcache_host_id, params->request_type);
 
     download_to_file_ = params->download_to_file;
     if (download_to_file_) {
       FilePath path;
       if (file_util::CreateTemporaryFile(&path)) {
         downloaded_file_ = ShareableFileReference::GetOrCreate(
             path, ShareableFileReference::DELETE_ON_FINAL_RELEASE,
             base::MessageLoopProxy::current());
@@ skipping 422 matching lines @@
     if (proxy_) {
       proxy_->DropPeer();
       // Let the proxy die on the IO thread
       g_io_thread->message_loop()->ReleaseSoon(FROM_HERE, proxy_);
     }
   }
 
   // --------------------------------------------------------------------------
   // ResourceLoaderBridge implementation:
 
-  virtual void AppendDataToUpload(const char* data, int data_len) {
+  virtual void SetRequestBody(ResourceRequestBody* request_body) {
     DCHECK(params_.get());
-    if (!params_->upload)
-      params_->upload = new net::UploadData();
-    params_->upload->AppendBytes(data, data_len);
-  }
-
-  virtual void AppendFileRangeToUpload(
-      const FilePath& file_path,
-      uint64 offset,
-      uint64 length,
-      const base::Time& expected_modification_time) {
-    DCHECK(params_.get());
-    if (!params_->upload)
-      params_->upload = new net::UploadData();
-    params_->upload->AppendFileRange(file_path, offset, length,
-                                     expected_modification_time);
-  }
-
-  virtual void AppendBlobToUpload(const GURL& blob_url) {
-    DCHECK(params_.get());
-    if (!params_->upload)
-      params_->upload = new net::UploadData();
-    params_->upload->AppendBlob(blob_url);
-  }
-
-  virtual void SetUploadIdentifier(int64 identifier) {
-    DCHECK(params_.get());
-    if (!params_->upload)
-      params_->upload = new net::UploadData();
-    params_->upload->set_identifier(identifier);
+    DCHECK(!params_->request_body);
+    params_->request_body = request_body;
   }
 
   virtual bool Start(Peer* peer) {
     DCHECK(!proxy_);
 
     if (!SimpleResourceLoaderBridge::EnsureIOThread())
       return false;
 
     proxy_ = new RequestProxy();
     proxy_->AddRef();
@@ skipping 216 matching lines @@
          (http_prefix.SchemeIs("http") || http_prefix.SchemeIs("https")));
   g_file_over_http_params = new FileOverHTTPParams(file_path_template,
                                                    http_prefix);
 }
 
 // static
 webkit_glue::ResourceLoaderBridge* SimpleResourceLoaderBridge::Create(
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return new ResourceLoaderBridgeImpl(request_info);
 }