[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/web/tests/ProgrammaticScrollTest.cpp

Index: Source/web/tests/ProgrammaticScrollTest.cpp
diff --git a/Source/web/tests/ProgrammaticScrollTest.cpp b/Source/web/tests/ProgrammaticScrollTest.cpp
index 3d47b0d7bcfd0b1651fe43f0e4364c2c851ec42e..d39075ca24b63fb2580bdaf6bec7a9010383d96a 100644
--- a/Source/web/tests/ProgrammaticScrollTest.cpp
+++ b/Source/web/tests/ProgrammaticScrollTest.cpp
@@ -61,7 +61,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale)
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     frame->loader().setLoadType(FrameLoadTypeBackForward);
 
-    webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));
+    webViewImpl->setPinchViewportScaleFactor(3.0f);
+    webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));
     frame->view()->setWasScrolledByUser(false);
     frame->loader().currentItem()->setPageScaleFactor(2);
     frame->loader().currentItem()->setScrollPoint(WebPoint(0, 200));
@@ -90,7 +91,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale)
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     frame->loader().setLoadType(FrameLoadTypeBackForward);
 
-    webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));
+    webViewImpl->setPinchViewportScaleFactor(3.0f);
+    webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));
     frame->view()->setWasScrolledByUser(false);
     frame->loader().currentItem()->setPageScaleFactor(0);
     frame->loader().currentItem()->setScrollPoint(WebPoint(0, 400));