| Index: services/view_manager/animation_runner_unittest.cc
|
| diff --git a/services/view_manager/animation_runner_unittest.cc b/services/view_manager/animation_runner_unittest.cc
|
| index 0801501a94be9a856d143619a24eb0ddf46ffe35..355c5ed8cfc57ab431b3b7d7624db3466344ffdf 100644
|
| --- a/services/view_manager/animation_runner_unittest.cc
|
| +++ b/services/view_manager/animation_runner_unittest.cc
|
| @@ -14,10 +14,10 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using base::TimeDelta;
|
| -using mojo::ANIMATION_PROPERTY_NONE;
|
| -using mojo::ANIMATION_PROPERTY_OPACITY;
|
| -using mojo::ANIMATION_PROPERTY_TRANSFORM;
|
| -using mojo::ANIMATION_TWEEN_TYPE_LINEAR;
|
| +using mojo::AnimationProperty::NONE;
|
| +using mojo::AnimationProperty::OPACITY;
|
| +using mojo::AnimationProperty::TRANSFORM;
|
| +using mojo::AnimationTweenType::LINEAR;
|
| using mojo::AnimationElement;
|
| using mojo::AnimationGroup;
|
| using mojo::AnimationProperty;
|
| @@ -106,7 +106,7 @@ void AddOpacityElement(AnimationGroup* group,
|
| AnimationValuePtr start_value,
|
| AnimationValuePtr target_value) {
|
| AddElement(group, time, start_value.Pass(), target_value.Pass(),
|
| - ANIMATION_PROPERTY_OPACITY, ANIMATION_TWEEN_TYPE_LINEAR);
|
| + AnimationProperty::OPACITY, AnimationTweenType::LINEAR);
|
| }
|
|
|
| void AddTransformElement(AnimationGroup* group,
|
| @@ -114,12 +114,12 @@ void AddTransformElement(AnimationGroup* group,
|
| AnimationValuePtr start_value,
|
| AnimationValuePtr target_value) {
|
| AddElement(group, time, start_value.Pass(), target_value.Pass(),
|
| - ANIMATION_PROPERTY_TRANSFORM, ANIMATION_TWEEN_TYPE_LINEAR);
|
| + AnimationProperty::TRANSFORM, AnimationTweenType::LINEAR);
|
| }
|
|
|
| void AddPauseElement(AnimationGroup* group, TimeDelta time) {
|
| AddElement(group, time, AnimationValuePtr(), AnimationValuePtr(),
|
| - ANIMATION_PROPERTY_NONE, ANIMATION_TWEEN_TYPE_LINEAR);
|
| + AnimationProperty::NONE, AnimationTweenType::LINEAR);
|
| }
|
|
|
| void InitGroupForView(AnimationGroup* group,
|
| @@ -496,7 +496,7 @@ TEST_F(AnimationRunnerTest, RescheduleSetsPropertiesToFinalValue) {
|
| ScheduleForSingleView(&view, &group, initial_time_);
|
|
|
| // Schedule() again, this time without animating opacity.
|
| - group.sequences[0]->elements[0]->property = ANIMATION_PROPERTY_NONE;
|
| + group.sequences[0]->elements[0]->property = AnimationProperty::NONE;
|
| ScheduleForSingleView(&view, &group, initial_time_);
|
|
|
| // Opacity should go to final value.
|
|
|