Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default

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 a308e7b3e135af03b88d913efd339e85a988b9b9..016594e6947014d3a1e16c390bb5c33c70c14810 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -927,6 +927,7 @@ TEST_P(VisualViewportTest, TestRestoredFromHistoryItem) {
   item.setURLString(destinationURL.string());
   item.setVisualViewportScrollOffset(WebFloatPoint(100, 120));
   item.setPageScaleFactor(2);
+  item.setDidSaveScrollState(true);
 
   FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item,
                                     WebHistoryDifferentDocumentLoad,
@@ -959,6 +960,7 @@ TEST_P(VisualViewportTest, TestRestoredFromLegacyHistoryItem) {
   item.setVisualViewportScrollOffset(WebFloatPoint(-1, -1));
   item.setScrollOffset(WebPoint(120, 180));
   item.setPageScaleFactor(2);
+  item.setDidSaveScrollState(true);
 
   FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item,
                                     WebHistoryDifferentDocumentLoad,