Relanding: Deduplicating code performing WebHTTPBody::Element conversions.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 76 matching lines @@
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/child_frame_compositing_helper.h"
 #include "content/renderer/context_menu_params_builder.h"
 #include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/effective_connection_type_helper.h"
 #include "content/renderer/external_popup_menu.h"
 #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"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/media_permission_dispatcher.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
 #include "content/renderer/media/midi_dispatcher.h"
 #include "content/renderer/media/render_media_log.h"
@@ skipping 437 matching lines @@
 // Converts the HTTP body data stored in ResourceRequestBody format to a
 // WebHTTPBody, which is then added to the WebURLRequest.
 // PlzNavigate: used to add the POST data sent by the renderer at commit time
 // to the WebURLRequest used to commit the navigation. This ensures that the
 // POST data will be in the PageState sent to the browser on commit.
 void AddHTTPBodyToRequest(WebURLRequest* request,
                           const scoped_refptr<ResourceRequestBody>& body) {
   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);
 }
 
 // Sanitizes the navigation_start timestamp for browser-initiated navigations,
 // where the browser possibly has a better notion of start time than the
 // renderer. In the case of cross-process navigations, this carries over the
 // time of finishing the onbeforeunload handler of the previous page.
 // TimeTicks is sometimes not monotonic across processes, and because
 // |browser_navigation_start| is likely before this process existed,
 // InterProcessTimeTicksConverter won't help. The timestamp is sanitized by
@@ skipping 5590 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content