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 e15730c253a0549e7dcd333083fad1a7c5bfddd5..51d98915dd153f42a17c71e4b58e26d76af33f4d 100644
--- a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
@@ -62,7 +62,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale) {
   // setPageScaleFactor because otherwise
   // FrameLoader::restoreScrollPositionAndViewState does nothing.
   loader.documentLoader()->initialScrollState().wasScrolledByUser = false;
-  loader.restoreScrollPositionAndViewState();
+  loader.setScrollFromNavigation();
 
   // Expect that both scroll and scale were restored.
   EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
@@ -90,7 +90,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) {
 
   // FrameLoader::restoreScrollPositionAndViewState flows differently if scale
   // is zero.
-  loader.restoreScrollPositionAndViewState();
+  loader.setScrollFromNavigation();
 
   // Expect that only the scroll position was restored.
   EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor());