Relanding: Deduplicating code performing WebHTTPBody::Element conversions.

content/common/page_state_serialization.h

 // 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.
 
 #ifndef CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_
 #define CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/strings/nullable_string16.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "content/common/resource_request_body.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebHistoryScrollRestorationType.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "url/gurl.h"
 
 namespace content {
 
-class ResourceRequestBody;
-
-struct CONTENT_EXPORT ExplodedHttpBodyElement {
-  blink::WebHTTPBody::Element::Type type;
-  std::string data;
-  base::NullableString16 file_path;
-  GURL filesystem_url;
-  int64_t file_start;
-  int64_t file_length;
-  double file_modification_time;
-  std::string blob_uuid;
-
-  ExplodedHttpBodyElement();
-  ExplodedHttpBodyElement(const ExplodedHttpBodyElement& other);
-  ~ExplodedHttpBodyElement();
-};
+using ExplodedHttpBodyElement = ResourceRequestBody::Element;
 
 struct CONTENT_EXPORT ExplodedHttpBody {
   base::NullableString16 http_content_type;
   std::vector<ExplodedHttpBodyElement> elements;
   int64_t identifier;
   bool contains_passwords;
   bool is_null;
 
   ExplodedHttpBody();
   ~ExplodedHttpBody();
@@ skipping 52 matching lines @@
 #if defined(OS_ANDROID)
 CONTENT_EXPORT bool DecodePageStateWithDeviceScaleFactorForTesting(
     const std::string& encoded,
     float device_scale_factor,
     ExplodedPageState* exploded);
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_