Deduping conversions between ResourceRequestBody/WebHTTPBody/ExplodedHttpBody.

content/renderer/history_serialization.cc

 // Copyright 2014 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/history_serialization.h"
 
 #include <stddef.h>
 
 #include "base/strings/nullable_string16.h"
+#include "content/child/web_url_request_util.h"
 #include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
 #include "content/renderer/history_entry.h"
-#include "content/renderer/http_body_conversions.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
 
 using blink::WebData;
@@ skipping 25 matching lines @@
   state->visual_viewport_scroll_offset = item.visualViewportScrollOffset();
   state->scroll_offset = item.scrollOffset();
   state->item_sequence_number = item.itemSequenceNumber();
   state->document_sequence_number =
       item.documentSequenceNumber();
   state->page_scale_factor = item.pageScaleFactor();
   ToNullableString16Vector(item.documentState(), &state->document_state);
 
   state->http_body.http_content_type = item.httpContentType();
   const WebHTTPBody& http_body = item.httpBody();
-  state->http_body.is_null = http_body.isNull();
-  if (!state->http_body.is_null) {
-    state->http_body.identifier = http_body.identifier();
-    state->http_body.elements.resize(http_body.elementCount());
-    for (size_t i = 0; i < http_body.elementCount(); ++i) {
-      WebHTTPBody::Element element;
-      http_body.elementAt(i, element);
-      ConvertToHttpBodyElement(element, &state->http_body.elements[i]);
-    }
+  if (!http_body.isNull()) {
+    state->http_body.request_body = GetRequestBodyForWebHTTPBody(http_body);
     state->http_body.contains_passwords = http_body.containsPasswordData();
   }
 }
 
 void RecursivelyGenerateFrameState(
     HistoryEntry::HistoryNode* node,
     ExplodedFrameState* state,
     std::vector<base::NullableString16>* referenced_files) {
   GenerateFrameStateFromItem(node->item(), state);
   ToNullableString16Vector(node->item().getReferencedFilePaths(),
@@ skipping 26 matching lines @@
 
   // These values are generated at WebHistoryItem construction time, and we
   // only want to override those new values with old values if the old values
   // are defined.  A value of 0 means undefined in this context.
   if (state.item_sequence_number)
     item.setItemSequenceNumber(state.item_sequence_number);
   if (state.document_sequence_number)
     item.setDocumentSequenceNumber(state.document_sequence_number);
 
   item.setHTTPContentType(state.http_body.http_content_type);
-  if (!state.http_body.is_null) {
-    WebHTTPBody http_body;
-    http_body.initialize();
-    http_body.setIdentifier(state.http_body.identifier);
-    for (size_t i = 0; i < state.http_body.elements.size(); ++i)
-      AppendHttpBodyElement(state.http_body.elements[i], &http_body);
-    item.setHTTPBody(http_body);
+  if (state.http_body.request_body != nullptr) {
+    item.setHTTPBody(
+        GetWebHTTPBodyForRequestBody(state.http_body.request_body));
   }
   node->set_item(item);
 
   for (size_t i = 0; i < state.children.size(); ++i)
     RecursivelyGenerateHistoryItem(state.children[i], node->AddChild());
 }
 
 }  // namespace
 
 PageState HistoryEntryToPageState(HistoryEntry* entry) {
@@ skipping 27 matching lines @@
   if (!DecodePageState(page_state.ToEncodedData(), &state))
     return std::unique_ptr<HistoryEntry>();
 
   std::unique_ptr<HistoryEntry> entry(new HistoryEntry());
   RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
 
   return entry;
 }
 
 }  // namespace content