Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default

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

Index: third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
index 064bb9143791c82fd447a1d0d796a7242ed8b0de..0ba96f275d2dfeda84b90af86fc1dcf511d9316c 100644
--- a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
@@ -58,6 +58,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale) {
   loader.documentLoader()->initialScrollState().wasScrolledByUser = false;
   loader.currentItem()->setPageScaleFactor(2);
   loader.currentItem()->setScrollOffset(ScrollOffset(0, 200));
+  loader.currentItem()->setDidSaveScrollState(true);
 
   // Flip back the wasScrolledByUser flag which was set to true by
   // setPageScaleFactor because otherwise
@@ -88,6 +89,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) {
   loader.documentLoader()->initialScrollState().wasScrolledByUser = false;
   loader.currentItem()->setPageScaleFactor(0);
   loader.currentItem()->setScrollOffset(ScrollOffset(0, 400));
+  loader.currentItem()->setDidSaveScrollState(true);
 
   // FrameLoader::restoreScrollPositionAndViewState flows differently if scale
   // is zero.