Replace various ScrollableArea scroll methods with setScrollPosition

Source/web/tests/ScrollAnimatorNoneTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 class MockScrollableArea : public ScrollableArea {
 public:
     MockScrollableArea(bool scrollAnimatorEnabled)
         : m_scrollAnimatorEnabled(scrollAnimatorEnabled) { }
 
     MOCK_CONST_METHOD0(isActive, bool());
     MOCK_CONST_METHOD1(scrollSize, int(ScrollbarOrientation));
     MOCK_METHOD2(invalidateScrollbar, void(Scrollbar*, const IntRect&));
     MOCK_CONST_METHOD0(isScrollCornerVisible, bool());
     MOCK_CONST_METHOD0(scrollCornerRect, IntRect());
-    MOCK_METHOD1(setScrollOffset, void(const IntPoint&));
+    MOCK_METHOD2(setScrollOffset, void(const IntPoint&, ScrollType));
     MOCK_METHOD2(invalidateScrollbarRect, void(Scrollbar*, const IntRect&));
     MOCK_METHOD1(invalidateScrollCornerRect, void(const IntRect&));
     MOCK_METHOD1(setScrollOffsetFromAnimation, void(const IntPoint&));
     MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*());
     MOCK_CONST_METHOD0(minimumScrollPosition, IntPoint());
     MOCK_CONST_METHOD0(maximumScrollPosition, IntPoint());
     MOCK_CONST_METHOD1(visibleContentRect, IntRect(IncludeScrollbarsInRect));
     MOCK_CONST_METHOD0(contentsSize, IntSize());
     MOCK_CONST_METHOD0(scrollbarsCanBeActive, bool());
     MOCK_CONST_METHOD0(scrollableAreaBoundingBox, IntRect());
@@ skipping 33 matching lines @@
         m_fp = FloatPoint::zero();
         m_count = 0;
     }
 
     virtual void fireUpAnAnimation(FloatPoint fp)
     {
         m_fp = fp;
         m_count++;
     }
 
-    MOCK_METHOD1(scrollToOffsetWithoutAnimation, void(const FloatPoint&));
 private:
     explicit MockScrollAnimatorNone(ScrollableArea* scrollableArea)
         : ScrollAnimatorNone(scrollableArea) { }
 
 };
 
 TEST(ScrollAnimatorEnabled, Enabled)
 {
     MockScrollableArea scrollableArea(true);
     RefPtr<MockScrollAnimatorNone> scrollAnimatorNone = MockScrollAnimatorNone::create(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));
     EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));
-    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
+    EXPECT_CALL(scrollableArea, setScrollOffset(_, _)).Times(4);
 
     scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByLine, 100, 1);
     EXPECT_NE(100, scrollAnimatorNone->currentX());
     EXPECT_NE(0, scrollAnimatorNone->currentX());
     EXPECT_EQ(0, scrollAnimatorNone->currentY());
     scrollAnimatorNone->reset();
 
     scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPage, 100, 1);
     EXPECT_NE(100, scrollAnimatorNone->currentX());
     EXPECT_NE(0, scrollAnimatorNone->currentX());
@@ skipping 13 matching lines @@
     scrollAnimatorNone->reset();
 }
 
 TEST(ScrollAnimatorEnabled, Disabled)
 {
     MockScrollableArea scrollableArea(false);
     RefPtr<MockScrollAnimatorNone> scrollAnimatorNone = MockScrollAnimatorNone::create(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));
-    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
+    EXPECT_CALL(scrollableArea, setScrollOffset(_, _)).Times(4);
 
     scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByLine, 100, 1);
     EXPECT_EQ(100, scrollAnimatorNone->currentX());
     EXPECT_EQ(0, scrollAnimatorNone->currentY());
     scrollAnimatorNone->reset();
 
     scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPage, 100, 1);
     EXPECT_EQ(100, scrollAnimatorNone->currentX());
     EXPECT_EQ(0, scrollAnimatorNone->currentY());
     scrollAnimatorNone->reset();
@@ skipping 878 matching lines @@
     EXPECT_TRUE(result);
     result = result && animateScroll(t);
     double after = m_currentPosition;
     EXPECT_GE(before, after);
 
     t += kAnimationTime;
     for (; result && t < kEndTime; t += kAnimationTime)
         result = result && animateScroll(t);
     EXPECT_GE(before, m_currentPosition);
 }