Relanding: Deduplicating code performing WebHTTPBody::Element conversions.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2c6ba29c494b40e5a56a8547b65b5741a4c3a054..d1e89938eed79cf680da24c78b0fc7131881b373 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -94,6 +94,7 @@
 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
+#include "content/renderer/http_body_conversions.h"
 #include "content/renderer/image_downloader/image_downloader_impl.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/internal_document_state_data.h"
@@ -551,34 +552,8 @@ void AddHTTPBodyToRequest(WebURLRequest* request,
   WebHTTPBody http_body;
   http_body.initialize();
   http_body.setIdentifier(body->identifier());
-  for (const ResourceRequestBody::Element& element : *(body->elements())) {
-    long long length = -1;
-    switch (element.type()) {
-      case storage::DataElement::TYPE_BYTES:
-        http_body.appendData(WebData(element.bytes(), element.length()));
-        break;
-      case storage::DataElement::TYPE_FILE:
-        if (element.length() != std::numeric_limits<uint64_t>::max())
-          length = element.length();
-        http_body.appendFileRange(
-            element.path().AsUTF16Unsafe(), element.offset(), length,
-            element.expected_modification_time().ToDoubleT());
-        break;
-      case storage::DataElement::TYPE_FILE_FILESYSTEM:
-        http_body.appendFileSystemURLRange(
-            element.filesystem_url(), element.offset(), element.length(),
-            element.expected_modification_time().ToDoubleT());
-        break;
-      case storage::DataElement::TYPE_BLOB:
-        http_body.appendBlob(WebString::fromUTF8(element.blob_uuid()));
-        break;
-      default:
-        // TYPE_BYTES_DESCRIPTION and TYPE_DISK_CACHE_ENTRY should not be
-        // encountered.
-        NOTREACHED();
-        break;
-    }
-  }
+  for (const ResourceRequestBody::Element& element : *(body->elements()))
+    AppendHttpBodyElement(element, &http_body);
   request->setHTTPBody(http_body);
 }