Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/page_state_serialization_unittest.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 <stddef.h>
 
 #include <cmath>
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
@@ skipping 23 matching lines @@
 }
 
 template <typename T>
 void ExpectEquality(const std::vector<T>& a, const std::vector<T>& b) {
   EXPECT_EQ(a.size(), b.size());
   for (size_t i = 0; i < std::min(a.size(), b.size()); ++i)
     ExpectEquality(a[i], b[i]);
 }
 
 template <>
-void ExpectEquality(const ResourceRequestBodyImpl::Element& a,
-                    const ResourceRequestBodyImpl::Element& b) {
+void ExpectEquality(const ResourceRequestBody::Element& a,
+                    const ResourceRequestBody::Element& b) {
   EXPECT_EQ(a.type(), b.type());
-  if (a.type() == ResourceRequestBodyImpl::Element::TYPE_BYTES &&
-      b.type() == ResourceRequestBodyImpl::Element::TYPE_BYTES) {
+  if (a.type() == ResourceRequestBody::Element::TYPE_BYTES &&
+      b.type() == ResourceRequestBody::Element::TYPE_BYTES) {
     EXPECT_EQ(std::string(a.bytes(), a.length()),
               std::string(b.bytes(), b.length()));
   }
   EXPECT_EQ(a.path(), b.path());
   EXPECT_EQ(a.filesystem_url(), b.filesystem_url());
   EXPECT_EQ(a.offset(), b.offset());
   EXPECT_EQ(a.length(), b.length());
   EXPECT_EQ(a.expected_modification_time(), b.expected_modification_time());
   EXPECT_EQ(a.blob_uuid(), b.blob_uuid());
 }
@@ skipping 53 matching lines @@
         blink::kWebHistoryScrollRestorationManual;
     frame_state->visual_viewport_scroll_offset = gfx::PointF(10, 15);
     frame_state->scroll_offset = gfx::Point(0, 100);
     frame_state->item_sequence_number = 1;
     frame_state->document_sequence_number = 2;
     frame_state->page_scale_factor = 2.0;
   }
 
   void PopulateHttpBody(ExplodedHttpBody* http_body,
                         std::vector<base::NullableString16>* referenced_files) {
-    http_body->request_body = new ResourceRequestBodyImpl();
+    http_body->request_body = new ResourceRequestBody();
     http_body->request_body->set_identifier(12345);
     http_body->contains_passwords = false;
     http_body->http_content_type = NS16("text/foo");
 
     std::string test_body("foo");
     http_body->request_body->AppendBytes(test_body.data(), test_body.size());
 
     base::FilePath path(FILE_PATH_LITERAL("file.txt"));
     http_body->request_body->AppendFileRange(base::FilePath(path), 100, 1024,
                                              base::Time::FromDoubleT(9999.0));
@@ skipping 23 matching lines @@
     frame_state->document_state.push_back(NS16("form key"));
     frame_state->document_state.push_back(NS16("1"));
     frame_state->document_state.push_back(NS16("foo"));
     frame_state->document_state.push_back(NS16("file"));
     frame_state->document_state.push_back(NS16("2"));
     frame_state->document_state.push_back(NS16("file.txt"));
     frame_state->document_state.push_back(NS16("displayName"));
 
     if (!is_child) {
       frame_state->http_body.http_content_type = NS16("foo/bar");
-      frame_state->http_body.request_body = new ResourceRequestBodyImpl();
+      frame_state->http_body.request_body = new ResourceRequestBody();
       frame_state->http_body.request_body->set_identifier(789);
 
       std::string test_body("first data block");
       frame_state->http_body.request_body->AppendBytes(test_body.data(),
                                                        test_body.size());
 
       frame_state->http_body.request_body->AppendFileRange(
           base::FilePath(FILE_PATH_LITERAL("file.txt")), 0,
           std::numeric_limits<uint64_t>::max(), base::Time::FromDoubleT(0.0));
 
@@ skipping 261 matching lines @@
 TEST_F(PageStateSerializationTest, BackwardsCompat_v22) {
   TestBackwardsCompat(22);
 }
 
 TEST_F(PageStateSerializationTest, BackwardsCompat_v23) {
   TestBackwardsCompat(23);
 }
 
 }  // namespace
 }  // namespace content