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

webkit/glue/resource_loader_bridge.h

 // 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.
 //
 // The intent of this file is to provide a type-neutral abstraction between
 // Chrome and WebKit for resource loading. This pure-virtual interface is
 // implemented by the embedder.
 //
 // One of these objects will be created by WebKit for each request. WebKit
 // will own the pointer to the bridge, and will delete it when the request is
@@ skipping 23 matching lines @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 namespace net {
 class HttpResponseHeaders;
 }
 
 namespace webkit_glue {
+class ResourceRequestBody;
 
 // Structure containing timing information for the request. It addresses
 // http://groups.google.com/group/http-archive-specification/web/har-1-1-spec
 // and http://dev.w3.org/2006/webapi/WebTiming/ needs.
 //
 // All the values for starts and ends are given in milliseconds and are
 // offsets with respect to the given base time.
 struct ResourceLoadTimingInfo {
   WEBKIT_GLUE_EXPORT ResourceLoadTimingInfo();
   WEBKIT_GLUE_EXPORT ~ResourceLoadTimingInfo();
@@ skipping 287 matching lines @@
         const base::TimeTicks& completion_time) = 0;
 
    protected:
     virtual ~Peer() {}
   };
 
   // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
   // anybody can delete at any time, INCLUDING during processing of callbacks.
   WEBKIT_GLUE_EXPORT virtual ~ResourceLoaderBridge();
 
-  // Call this method before calling Start() to append a chunk of binary data
-  // to the request body.  May only be used with HTTP(S) POST requests.
-  virtual void AppendDataToUpload(const char* data, int data_len) = 0;
-
-  // Call this method before calling Start() to append the contents of a file
-  // to the request body.  May only be used with HTTP(S) POST requests.
-  void AppendFileToUpload(const FilePath& file_path) {
-    AppendFileRangeToUpload(file_path, 0, kuint64max, base::Time());
-  }
-
-  // Call this method before calling Start() to append the contents of a file
-  // to the request body.  May only be used with HTTP(S) POST requests.
-  virtual void AppendFileRangeToUpload(
-      const FilePath& file_path,
-      uint64 offset,
-      uint64 length,
-      const base::Time& expected_modification_time) = 0;
-
-  // Call this method before calling Start() to append the contents of a blob
-  // to the request body.  May only be used with HTTP(S) POST requests.
-  virtual void AppendBlobToUpload(const GURL& blob_url) = 0;
-
-  // Call this method before calling Start() to assign an upload identifier to
-  // this request.  This is used to enable caching of POST responses.  A value
-  // of 0 implies the unspecified identifier.
-  virtual void SetUploadIdentifier(int64 identifier) = 0;
+  // Call this method before calling Start() to set the request body.
+  // May only be used with HTTP(S) POST requests.
+  virtual void SetRequestBody(ResourceRequestBody* request_body) = 0;
 
   // Call this method to initiate the request.  If this method succeeds, then
   // the peer's methods will be called asynchronously to report various events.
   virtual bool Start(Peer* peer) = 0;
 
   // Call this method to cancel a request that is in progress.  This method
   // causes the request to immediately transition into the 'done' state. The
   // OnCompletedRequest method will be called asynchronously; this assumes
   // the peer is still valid.
   virtual void Cancel() = 0;
@@ skipping 18 matching lines @@
   // methods may be called to construct the body of the request.
   WEBKIT_GLUE_EXPORT ResourceLoaderBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_