Relanding: Deduplicating code performing WebHTTPBody::Element conversions.

content/public/common/page_state.cc

 // Copyright (c) 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/public/common/page_state.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
+#include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/page_state_serialization.h"
 
 namespace content {
 namespace {
 
 base::NullableString16 ToNullableString16(const std::string& utf8) {
   return base::NullableString16(base::UTF8ToUTF16(utf8), false);
 }
 
@@ skipping 60 matching lines @@
     const char* optional_body_data,
     const base::FilePath* optional_body_file_path) {
   ExplodedPageState state;
 
   state.top.url_string = ToNullableString16(url.possibly_invalid_spec());
 
   if (optional_body_data || optional_body_file_path) {
     state.top.http_body.is_null = false;
     if (optional_body_data) {
       ExplodedHttpBodyElement element;
-      element.type = blink::WebHTTPBody::Element::TypeData;
-      element.data = optional_body_data;
+      std::string body_data(optional_body_data);
+      element.SetToBytes(body_data.data(), body_data.size());
       state.top.http_body.elements.push_back(element);
     }
     if (optional_body_file_path) {
       ExplodedHttpBodyElement element;
-      element.type = blink::WebHTTPBody::Element::TypeFile;
-      element.file_path =
-          ToNullableString16(optional_body_file_path->AsUTF8Unsafe());
-      state.top.http_body.elements.push_back(element);
-      state.referenced_files.push_back(element.file_path);
+      element.SetToFilePath(*optional_body_file_path);
+      state.referenced_files.push_back(base::NullableString16(
+          optional_body_file_path->AsUTF16Unsafe(), false));
     }
     state.top.http_body.contains_passwords =
         body_contains_password_data;
   }
 
   return ToPageState(state);
 }
 
 PageState::PageState() {
 }
@@ skipping 54 matching lines @@
 }
 
 PageState::PageState(const std::string& data)
     : data_(data) {
   // TODO(darin): Enable this DCHECK once tests have been fixed up to not pass
   // bogus encoded data to CreateFromEncodedData.
   //DCHECK(IsValid());
 }
 
 }  // namespace content