Deduping conversions between ResourceRequestBody/WebHTTPBody/ExplodedHttpBody.

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"
@@ skipping 67 matching lines @@
 PageState PageState::CreateForTesting(
     const GURL& url,
     bool body_contains_password_data,
     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;
       std::string body_data(optional_body_data);
-      element.SetToBytes(body_data.data(), body_data.size());
-      state.top.http_body.elements.push_back(element);
+      state.top.http_body.request_body = new ResourceRequestBody();
+      state.top.http_body.request_body->AppendBytes(body_data.data(),
+                                                    body_data.size());
     }
     if (optional_body_file_path) {
-      ExplodedHttpBodyElement element;
-      element.SetToFilePath(*optional_body_file_path);
+      state.top.http_body.request_body = new ResourceRequestBody();
+      state.top.http_body.request_body->AppendFileRange(
+          *optional_body_file_path,
+          0, std::numeric_limits<uint64_t>::max(),
+          base::Time());
       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);
 }
 
@@ skipping 56 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