Consolidate content fling implementations

ui/events/gestures/fling_curve_unittest.cc

Index: ui/events/gestures/fling_curve_unittest.cc
diff --git a/ui/events/gestures/fling_curve_unittest.cc b/ui/events/gestures/fling_curve_unittest.cc
index 653a5effff8c9ea5cf2bf64f683183eca156cc76..d6dffef9d6c80d7c7c70d5ee844db1ab15bc7b86 100644
--- a/ui/events/gestures/fling_curve_unittest.cc
+++ b/ui/events/gestures/fling_curve_unittest.cc
@@ -14,23 +14,25 @@ TEST(FlingCurveTest, Basic) {
   base::TimeTicks now = gfx::FrameTime::Now();
   FlingCurve curve(velocity, now);
 
-  gfx::Vector2dF scroll =
-      curve.GetScrollAmountAtTime(now + base::TimeDelta::FromMilliseconds(20));
-  EXPECT_EQ(0, scroll.x());
-  EXPECT_NEAR(scroll.y(), 96, 1);
-
-  scroll =
-      curve.GetScrollAmountAtTime(now + base::TimeDelta::FromMilliseconds(250));
-  EXPECT_EQ(0, scroll.x());
-  EXPECT_NEAR(scroll.y(), 705, 1);
-
-  scroll =
-      curve.GetScrollAmountAtTime(now + base::TimeDelta::FromSeconds(10));
-  EXPECT_EQ(0, scroll.x());
-  EXPECT_NEAR(scroll.y(), 392, 1);
-
-  EXPECT_TRUE(curve.GetScrollAmountAtTime(
-      now + base::TimeDelta::FromSeconds(20)).IsZero());
+  gfx::Vector2dF delta;
+  EXPECT_TRUE(curve.ComputeScrollDeltaAtTime(
+      now + base::TimeDelta::FromMilliseconds(20), &delta));
+  EXPECT_EQ(0, delta.x());
+  EXPECT_NEAR(delta.y(), 96, 1);
+
+  EXPECT_TRUE(curve.ComputeScrollDeltaAtTime(
+      now + base::TimeDelta::FromMilliseconds(250), &delta));
+  EXPECT_EQ(0, delta.x());
+  EXPECT_NEAR(delta.y(), 705, 1);
+
+  EXPECT_FALSE(curve.ComputeScrollDeltaAtTime(
+      now + base::TimeDelta::FromSeconds(10), &delta));
+  EXPECT_EQ(0, delta.x());
+  EXPECT_NEAR(delta.y(), 392, 1);
+
+  EXPECT_FALSE(curve.ComputeScrollDeltaAtTime(
+      now + base::TimeDelta::FromSeconds(20), &delta));
+  EXPECT_TRUE(delta.IsZero());
 }
 
 }  // namespace ui