Changing scroll and view state in onpopstate shouldn't overwrite back/forward state restore

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
index 76963e39c21f39fe63df28043828d31e3d016f8d..d5e4af7dc84aa1dbc01089bf73196720930456c2 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -869,12 +869,11 @@ TEST_P(VisualViewportTest, TestSavedToHistoryItem) {
   RegisterMockedHttpURLLoad("200-by-300.html");
   NavigateTo(base_url_ + "200-by-300.html");
 
-  EXPECT_SIZE_EQ(ScrollOffset(0, 0),
-                 ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
-                     ->Loader()
-                     .GetDocumentLoader()
-                     ->GetHistoryItem()
-                     ->VisualViewportScrollOffset());
+  EXPECT_EQ(nullptr, ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
+                         ->Loader()
+                         .GetDocumentLoader()
+                         ->GetHistoryItem()
+                         ->GetScrollAndViewState());
 
   VisualViewport& visual_viewport = GetFrame()->GetPage()->GetVisualViewport();
   visual_viewport.SetScale(2);
@@ -883,7 +882,8 @@ TEST_P(VisualViewportTest, TestSavedToHistoryItem) {
                    ->Loader()
                    .GetDocumentLoader()
                    ->GetHistoryItem()
-                   ->PageScaleFactor());
+                   ->GetScrollAndViewState()
+                   ->page_scale_factor_);
 
   visual_viewport.SetLocation(FloatPoint(10, 20));
 
@@ -892,7 +892,8 @@ TEST_P(VisualViewportTest, TestSavedToHistoryItem) {
                      ->Loader()
                      .GetDocumentLoader()
                      ->GetHistoryItem()
-                     ->VisualViewportScrollOffset());
+                     ->GetScrollAndViewState()
+                     ->visual_viewport_scroll_offset_);
 }
 
 // Test restoring a HistoryItem properly restores the visual viewport's state.
@@ -980,7 +981,8 @@ TEST_P(VisualViewportTest,
                                           ->Loader()
                                           .GetDocumentLoader()
                                           ->GetHistoryItem();
-  EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->GetScrollOffset());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1000),
+                 firstItem->GetScrollAndViewState()->scroll_offset_);
 
   // Now navigate to a page which causes a smaller frame_view. Make sure that
   // navigating doesn't cause the history item to set a new scroll offset
@@ -995,7 +997,8 @@ TEST_P(VisualViewportTest,
                            .GetDocumentLoader()
                            ->GetHistoryItem());
   EXPECT_LT(frame_view->FrameRect().Size().Width(), 1000);
-  EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->GetScrollOffset());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1000),
+                 firstItem->GetScrollAndViewState()->scroll_offset_);
 }
 
 // Test that the coordinates sent into moveRangeSelection are offset by the