Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/public/common/resource_request_body.h

Index: content/public/common/resource_request_body.h
diff --git a/content/public/common/resource_request_body.h b/content/public/common/resource_request_body.h
index 606c31994c8d1affc189b147179a1a8c9a1f1a60..6709d40cbaef783f0b263a93594558a2a6ac2efc 100644
--- a/content/public/common/resource_request_body.h
+++ b/content/public/common/resource_request_body.h
@@ -14,6 +14,8 @@
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "storage/common/data_element.h"
+#include "url/gurl.h"
 
 #if defined(OS_ANDROID)
 #include <jni.h>
@@ -23,22 +25,13 @@
 namespace content {
 
 // ResourceRequestBody represents body (i.e. upload data) of a HTTP request.
-//
-// This class is intentionally opaque:
-// *) Embedders cannot inspect the payload of ResourceRequestBody.  Only the
-//    //content layer can decompose ResourceRequestBody into references to file
-//    ranges, byte vectors, blob uris, etc.
-// *) Embedders can get instances of ResourceRequestBody only by
-//    - receiving an instance created inside //content layer (e.g. receiving it
-//      via content::OpenURLParams),
-//    - calling CreateFromBytes with a vector of bytes (e.g. to support
-//      Android's WebView::postUrl API, to support DoSearchByImageInNewTab and
-//      to support test code).
-// *) Embedders typically end up passing ResourceRequestBody back into the
-//    //content layer via content::NavigationController::LoadUrlParams.
 class CONTENT_EXPORT ResourceRequestBody
     : public base::RefCountedThreadSafe<ResourceRequestBody> {
  public:
+  typedef storage::DataElement Element;
+
+  ResourceRequestBody();
+
   // Creates ResourceRequestBody that holds a copy of |bytes|.
   static scoped_refptr<ResourceRequestBody> CreateFromBytes(const char* bytes,
                                                             size_t length);
@@ -55,12 +48,54 @@ class CONTENT_EXPORT ResourceRequestBody
       const base::android::JavaParamRef<jobject>& java_object);
 #endif
 
- protected:
-  ResourceRequestBody();
-  virtual ~ResourceRequestBody();
+  void AppendBytes(const char* bytes, int bytes_len);
+  void AppendFileRange(const base::FilePath& file_path,
+                       uint64_t offset,
+                       uint64_t length,
+                       const base::Time& expected_modification_time);
+
+  // --------------------------------------------------------------
+  // All of the below methods are only intended for use by content.

[jam, 2017/06/29 20:30:58]

nit: no need to mention caller, this will eventually be blink as the
web_url_request_util code moves to blink

[mmenke, 2017/06/29 20:33:33]

I'll remove the comment, but note that this API will be used by chrome/ as well
- plenty of chrome code wants to upload stuff.

+  // --------------------------------------------------------------
+
+  void AppendBlob(const std::string& uuid);
+  void AppendFileSystemFileRange(const GURL& url,
+                                 uint64_t offset,
+                                 uint64_t length,
+                                 const base::Time& expected_modification_time);
+
+  const std::vector<Element>* elements() const { return &elements_; }
+  std::vector<Element>* elements_mutable() { return &elements_; }
+  void swap_elements(std::vector<Element>* elements) {
+    elements_.swap(*elements);
+  }
+
+  // Identifies a particular upload instance, which is used by the cache to
+  // formulate a cache key.  This value should be unique across browser
+  // sessions.  A value of 0 is used to indicate an unspecified identifier.
+  void set_identifier(int64_t id) { identifier_ = id; }
+  int64_t identifier() const { return identifier_; }
+
+  // Returns paths referred to by |elements| of type Element::TYPE_FILE.
+  std::vector<base::FilePath> GetReferencedFiles() const;
+
+  // Sets the flag which indicates whether the post data contains sensitive
+  // information like passwords.
+  void set_contains_sensitive_info(bool contains_sensitive_info) {
+    contains_sensitive_info_ = contains_sensitive_info;
+  }
+  bool contains_sensitive_info() const { return contains_sensitive_info_; }
 
  private:
   friend class base::RefCountedThreadSafe<ResourceRequestBody>;
+
+  ~ResourceRequestBody();
+
+  std::vector<Element> elements_;
+  int64_t identifier_;
+
+  bool contains_sensitive_info_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestBody);
 };