Reland "Unifies ScrollView and RenderLayer to use non-shi..."

Source/WebKit/chromium/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 99 matching lines @@
 
     MOCK_METHOD1(scrollToOffsetWithoutAnimation, void(const FloatPoint&));
 };
 
 TEST(ScrollAnimatorEnabled, Enabled)
 {
     MockScrollableArea scrollableArea(true);
     MockScrollAnimatorNone scrollAnimatorNone(&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);
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
     EXPECT_NE(100, scrollAnimatorNone.currentX());
     EXPECT_NE(0, scrollAnimatorNone.currentX());
     EXPECT_EQ(0, scrollAnimatorNone.currentY());
     scrollAnimatorNone.reset();
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
     EXPECT_NE(100, scrollAnimatorNone.currentX());
@@ skipping 12 matching lines @@
     EXPECT_NE(0, scrollAnimatorNone.currentX());
     EXPECT_EQ(0, scrollAnimatorNone.currentY());
     scrollAnimatorNone.reset();
 }
 
 TEST(ScrollAnimatorEnabled, Disabled)
 {
     MockScrollableArea scrollableArea(false);
     MockScrollAnimatorNone scrollAnimatorNone(&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);
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
     EXPECT_EQ(100, scrollAnimatorNone.currentX());
     EXPECT_EQ(0, scrollAnimatorNone.currentY());
     scrollAnimatorNone.reset();
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
     EXPECT_EQ(100, scrollAnimatorNone.currentX());
     EXPECT_EQ(0, scrollAnimatorNone.currentY());
@@ skipping 873 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);
 }