| Index: ui/compositor/layer_animation_sequence_unittest.cc
|
| diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc
|
| index 708cc0ad8f207eb717b7e29f4f00d0a084f9ce3b..0a62ddb8d5b5216eb63f89b676b4b9dc7495f856 100644
|
| --- a/ui/compositor/layer_animation_sequence_unittest.cc
|
| +++ b/ui/compositor/layer_animation_sequence_unittest.cc
|
| @@ -94,7 +94,7 @@ TEST(LayerAnimationSequenceTest, SingleThreadedElement) {
|
| effective_start = start_time + delta;
|
| sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
|
| cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
|
| - cc::Animation::OPACITY, effective_start));
|
| + cc::TargetProperty::OPACITY, effective_start));
|
| sequence.Progress(effective_start + delta/2, &delegate);
|
| EXPECT_FLOAT_EQ(middle, sequence.last_progressed_fraction());
|
| EXPECT_TRUE(sequence.IsFinished(effective_start + delta));
|
| @@ -148,7 +148,7 @@ TEST(LayerAnimationSequenceTest, MultipleElement) {
|
| EXPECT_EQ(starting_group_id, sequence.animation_group_id());
|
| sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
|
| cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
|
| - cc::Animation::OPACITY, opacity_effective_start));
|
| + cc::TargetProperty::OPACITY, opacity_effective_start));
|
| sequence.Progress(opacity_effective_start + delta/2, &delegate);
|
| EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
|
| sequence.Progress(opacity_effective_start + delta, &delegate);
|
| @@ -176,7 +176,7 @@ TEST(LayerAnimationSequenceTest, MultipleElement) {
|
| EXPECT_NE(starting_group_id, sequence.animation_group_id());
|
| sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
|
| cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
|
| - cc::Animation::TRANSFORM, transform_effective_start));
|
| + cc::TargetProperty::TRANSFORM, transform_effective_start));
|
| sequence.Progress(transform_effective_start + delta/2, &delegate);
|
| EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
|
| EXPECT_TRUE(sequence.IsFinished(transform_effective_start + delta));
|
|
|