Add scroll restoration type to page state

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 <cmath>
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
@@ skipping 52 matching lines @@
 }
 
 template <>
 void ExpectEquality(const ExplodedFrameState& a, const ExplodedFrameState& b) {
   EXPECT_EQ(a.url_string, b.url_string);
   EXPECT_EQ(a.referrer, b.referrer);
   EXPECT_EQ(a.referrer_policy, b.referrer_policy);
   EXPECT_EQ(a.target, b.target);
   EXPECT_EQ(a.state_object, b.state_object);
   ExpectEquality(a.document_state, b.document_state);
+  EXPECT_EQ(a.scroll_restoration_type, b.scroll_restoration_type);
   EXPECT_EQ(a.pinch_viewport_scroll_offset, b.pinch_viewport_scroll_offset);
   EXPECT_EQ(a.scroll_offset, b.scroll_offset);
   EXPECT_EQ(a.item_sequence_number, b.item_sequence_number);
   EXPECT_EQ(a.document_sequence_number, b.document_sequence_number);
   EXPECT_EQ(a.page_scale_factor, b.page_scale_factor);
   ExpectEquality(a.http_body, b.http_body);
   ExpectEquality(a.children, b.children);
 }
 
 void ExpectEquality(const ExplodedPageState& a, const ExplodedPageState& b) {
   ExpectEquality(a.referenced_files, b.referenced_files);
   ExpectEquality(a.top, b.top);
 }
 
 //-----------------------------------------------------------------------------
 
 class PageStateSerializationTest : public testing::Test {
  public:
   void PopulateFrameState(ExplodedFrameState* frame_state) {
     // Invent some data for the various fields.
     frame_state->url_string = NS16("http://dev.chromium.org/");
     frame_state->referrer = NS16("https://www.google.com/search?q=dev.chromium.org");
     frame_state->referrer_policy = blink::WebReferrerPolicyAlways;
     frame_state->target = NS16("foo");
     frame_state->state_object = NS16(NULL);
     frame_state->document_state.push_back(NS16("1"));
     frame_state->document_state.push_back(NS16("q"));
     frame_state->document_state.push_back(NS16("text"));
     frame_state->document_state.push_back(NS16("dev.chromium.org"));
+    frame_state->scroll_restoration_type =
+        blink::WebHistoryScrollRestorationManual;
     frame_state->pinch_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->frame_sequence_number = 3;
     frame_state->page_scale_factor = 2.0;
   }
 
   void PopulateHttpBody(ExplodedHttpBody* http_body,
                         std::vector<base::NullableString16>* referenced_files) {
@@ skipping 19 matching lines @@
   }
 
   void PopulateFrameStateForBackwardsCompatTest(
       ExplodedFrameState* frame_state,
       bool is_child) {
     frame_state->url_string = NS16("http://chromium.org/");
     frame_state->referrer = NS16("http://google.com/");
     frame_state->referrer_policy = blink::WebReferrerPolicyDefault;
     if (!is_child)
       frame_state->target = NS16("target");
+    frame_state->scroll_restoration_type =
+        blink::WebHistoryScrollRestorationAuto;
     frame_state->pinch_viewport_scroll_offset = gfx::PointF(-1, -1);
     frame_state->scroll_offset = gfx::Point(42, -42);
     frame_state->item_sequence_number = 123;
     frame_state->document_sequence_number = 456;
     frame_state->frame_sequence_number = 789;
     frame_state->page_scale_factor = 2.0f;
 
     frame_state->document_state.push_back(
         NS16("\n\r?% WebKit serialized form state version 8 \n\r=&"));
     frame_state->document_state.push_back(NS16("form key"));
@@ skipping 270 matching lines @@
 }
 
 TEST_F(PageStateSerializationTest, BackwardsCompat_v18) {
   TestBackwardsCompat(18);
 }
 
 TEST_F(PageStateSerializationTest, BackwardsCompat_v20) {
   TestBackwardsCompat(20);
 }
 
+TEST_F(PageStateSerializationTest, BackwardsCompat_v21) {
+  TestBackwardsCompat(21);
+}
+
 }  // namespace
 }  // namespace content