| Index: ui/compositor/layer_animation_element_unittest.cc
|
| diff --git a/ui/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc
|
| index 153f1df64b66b47fd2579892f85c6d50a28c0b95..8871a2c9f5efee4c33741bd79e6c792c3de433e1 100644
|
| --- a/ui/compositor/layer_animation_element_unittest.cc
|
| +++ b/ui/compositor/layer_animation_element_unittest.cc
|
| @@ -366,7 +366,7 @@ TEST(LayerAnimationElementTest, AbortOpacityElement) {
|
| LayerAnimationElement::CreateOpacityElement(target, delta));
|
|
|
| // Choose a non-linear Tween type.
|
| - Tween::Type tween_type = Tween::EASE_IN;
|
| + gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
|
| element->set_tween_type(tween_type);
|
|
|
| delegate.SetOpacityFromAnimation(start);
|
| @@ -387,7 +387,7 @@ TEST(LayerAnimationElementTest, AbortOpacityElement) {
|
| // Since the element has started, it should update the delegate when
|
| // aborted.
|
| element->Abort(&delegate);
|
| - EXPECT_FLOAT_EQ(Tween::CalculateValue(tween_type, 0.5),
|
| + EXPECT_FLOAT_EQ(gfx::Tween::CalculateValue(tween_type, 0.5),
|
| delegate.GetOpacityForAnimation());
|
| }
|
|
|
| @@ -405,7 +405,7 @@ TEST(LayerAnimationElementTest, AbortTransformElement) {
|
| LayerAnimationElement::CreateTransformElement(target_transform, delta));
|
|
|
| // Choose a non-linear Tween type.
|
| - Tween::Type tween_type = Tween::EASE_IN;
|
| + gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
|
| element->set_tween_type(tween_type);
|
|
|
| delegate.SetTransformFromAnimation(start_transform);
|
| @@ -427,7 +427,7 @@ TEST(LayerAnimationElementTest, AbortTransformElement) {
|
| // aborted.
|
| element->Abort(&delegate);
|
| target_transform.Blend(start_transform,
|
| - Tween::CalculateValue(tween_type, 0.5));
|
| + gfx::Tween::CalculateValue(tween_type, 0.5));
|
| CheckApproximatelyEqual(target_transform,
|
| delegate.GetTransformForAnimation());
|
| }
|
|
|