Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/animation/scroll_offset_animation_curve_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/scroll_offset_animation_curve.h"
 
 #include "cc/animation/timing_function.h"
 #include "cc/base/time_util.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 50 matching lines @@
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(
           target_value,
           EaseInOutTimingFunction::Create().Pass()));
   curve->SetInitialValue(initial_value);
 
   base::TimeDelta duration = curve->Duration();
   EXPECT_GT(curve->Duration().InSecondsF(), 0);
   EXPECT_LT(curve->Duration().InSecondsF(), 0.1);
 
-  EXPECT_EQ(AnimationCurve::SCROLL_OFFSET, curve->Type());
+  EXPECT_EQ(AnimationCurve::ScrollOffset, curve->Type());
   EXPECT_EQ(duration, curve->Duration());
 
   EXPECT_VECTOR2DF_EQ(initial_value,
                       curve->GetValue(base::TimeDelta::FromSecondsD(-1.0)));
   EXPECT_VECTOR2DF_EQ(initial_value, curve->GetValue(base::TimeDelta()));
   EXPECT_VECTOR2DF_NEAR(gfx::ScrollOffset(6.f, 30.f),
                         curve->GetValue(TimeUtil::Scale(duration, 0.5f)),
                         0.00025);
   EXPECT_VECTOR2DF_EQ(target_value, curve->GetValue(duration));
   EXPECT_VECTOR2DF_EQ(
@@ skipping 12 matching lines @@
   gfx::ScrollOffset target_value(10.f, 20.f);
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(
           target_value,
           EaseInOutTimingFunction::Create().Pass()));
   curve->SetInitialValue(initial_value);
   base::TimeDelta duration = curve->Duration();
 
   scoped_ptr<AnimationCurve> clone(curve->Clone().Pass());
 
-  EXPECT_EQ(AnimationCurve::SCROLL_OFFSET, clone->Type());
+  EXPECT_EQ(AnimationCurve::ScrollOffset, clone->Type());
   EXPECT_EQ(duration, clone->Duration());
 
   EXPECT_VECTOR2DF_EQ(initial_value,
                       clone->ToScrollOffsetAnimationCurve()->GetValue(
                           base::TimeDelta::FromSecondsD(-1.0)));
   EXPECT_VECTOR2DF_EQ(
       initial_value,
       clone->ToScrollOffsetAnimationCurve()->GetValue(base::TimeDelta()));
   EXPECT_VECTOR2DF_NEAR(gfx::ScrollOffset(6.f, 30.f),
                         clone->ToScrollOffsetAnimationCurve()->GetValue(
@@ skipping 34 matching lines @@
   curve->UpdateTarget(1.0, gfx::ScrollOffset(0.0, 7200.0));
 
   EXPECT_NEAR(1.674, curve->Duration().InSecondsF(), 0.01);
   EXPECT_NEAR(5566.49, curve->GetValue(base::TimeDelta::FromSecondsD(1.0)).y(),
               0.01);
   EXPECT_EQ(7200.0, curve->GetValue(base::TimeDelta::FromSecondsD(1.674)).y());
 }
 
 }  // namespace
 }  // namespace cc