CC Animation: Expose TargetProperty enum to be aliased in Blink Platform.

cc/animation/layer_animation_controller_unittest.cc

 // Copyright 2012 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/layer_animation_controller.h"
 
 #include <stddef.h>
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
@@ skipping 20 matching lines @@
                                             base::Time::kMicrosecondsPerSecond);
 }
 
 // A LayerAnimationController cannot be ticked at 0.0, since an animation
 // with start time 0.0 is treated as an animation whose start time has
 // not yet been set.
 const TimeTicks kInitialTickTime = TicksFromSecondsF(1.0);
 
 scoped_ptr<Animation> CreateAnimation(scoped_ptr<AnimationCurve> curve,
                                       int group_id,
-                                      Animation::TargetProperty property) {
+                                      AnimationTargetProperty::Enum property) {
   return Animation::Create(std::move(curve), 0, group_id, property);
 }
 
 TEST(LayerAnimationControllerTest, SyncNewAnimation) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
-  EXPECT_FALSE(controller_impl->GetAnimation(Animation::OPACITY));
+  EXPECT_FALSE(controller_impl->GetAnimation(AnimationTargetProperty::OPACITY));
 
   EXPECT_FALSE(controller->needs_to_start_animations_for_testing());
   EXPECT_FALSE(controller_impl->needs_to_start_animations_for_testing());
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
   EXPECT_TRUE(controller->needs_to_start_animations_for_testing());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   EXPECT_TRUE(controller_impl->needs_to_start_animations_for_testing());
@@ skipping 12 matching lines @@
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   controller_impl->set_value_provider(&dummy_provider_impl);
   FakeLayerAnimationValueObserver dummy;
   FakeLayerAnimationValueProvider dummy_provider;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   controller->set_value_provider(&dummy_provider);
 
-  EXPECT_FALSE(controller_impl->GetAnimation(Animation::SCROLL_OFFSET));
+  EXPECT_FALSE(
+      controller_impl->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET));
 
   EXPECT_FALSE(controller->needs_to_start_animations_for_testing());
   EXPECT_FALSE(controller_impl->needs_to_start_animations_for_testing());
 
   gfx::ScrollOffset initial_value(100.f, 300.f);
   gfx::ScrollOffset provider_initial_value(150.f, 300.f);
   gfx::ScrollOffset target_value(300.f, 200.f);
 
   dummy_provider_impl.set_scroll_offset(provider_initial_value);
 
   // Animation with initial value set.
   scoped_ptr<ScrollOffsetAnimationCurve> curve_fixed(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
   curve_fixed->SetInitialValue(initial_value);
   scoped_ptr<Animation> animation_fixed(
       Animation::Create(std::move(curve_fixed), 1 /* animation_id */, 0,
-                        Animation::SCROLL_OFFSET));
+                        AnimationTargetProperty::SCROLL_OFFSET));
   controller->AddAnimation(std::move(animation_fixed));
   controller->PushAnimationUpdatesTo(controller_impl.get());
   EXPECT_VECTOR2DF_EQ(initial_value, controller_impl->GetAnimationById(1)
                                          ->curve()
                                          ->ToScrollOffsetAnimationCurve()
                                          ->GetValue(base::TimeDelta()));
 
   // Animation without initial value set.
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
-  scoped_ptr<Animation> animation(Animation::Create(
-      std::move(curve), 2 /* animation id */, 0, Animation::SCROLL_OFFSET));
+  scoped_ptr<Animation> animation(
+      Animation::Create(std::move(curve), 2 /* animation id */, 0,
+                        AnimationTargetProperty::SCROLL_OFFSET));
   controller->AddAnimation(std::move(animation));
   controller->PushAnimationUpdatesTo(controller_impl.get());
   EXPECT_VECTOR2DF_EQ(provider_initial_value,
                       controller_impl->GetAnimationById(2)
                           ->curve()
                           ->ToScrollOffsetAnimationCurve()
                           ->GetValue(base::TimeDelta()));
 }
 
 // If an animation is started on the impl thread before it is ticked on the main
 // thread, we must be sure to respect the synchronized start time.
 TEST(LayerAnimationControllerTest, DoNotClobberStartTimes) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
-  EXPECT_FALSE(controller_impl->GetAnimation(Animation::OPACITY));
+  EXPECT_FALSE(controller_impl->GetAnimation(AnimationTargetProperty::OPACITY));
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller_impl->GetAnimationById(animation_id)->run_state());
@@ skipping 22 matching lines @@
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
 
   const TimeTicks start_time = TicksFromSecondsF(123);
-  controller->GetAnimation(Animation::OPACITY)->set_start_time(start_time);
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
+      ->set_start_time(start_time);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller_impl->GetAnimationById(animation_id)->run_state());
 
   AnimationEvents events;
   controller_impl->Animate(kInitialTickTime);
@@ skipping 61 matching lines @@
   EXPECT_EQ(1u, registrar->active_animation_controllers_for_testing().size());
   EXPECT_EQ(1u,
             registrar_impl->active_animation_controllers_for_testing().size());
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(500));
   controller->UpdateState(true, nullptr);
   EXPECT_EQ(1u, registrar->active_animation_controllers_for_testing().size());
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, nullptr);
-  EXPECT_EQ(Animation::FINISHED,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::FINISHED,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_EQ(1u, registrar->active_animation_controllers_for_testing().size());
 
   events.reset(new AnimationEvents);
   controller_impl->Animate(kInitialTickTime +
                            TimeDelta::FromMilliseconds(1500));
   controller_impl->UpdateState(true, events.get());
 
   EXPECT_EQ(Animation::WAITING_FOR_DELETION,
-            controller_impl->GetAnimation(Animation::OPACITY)->run_state());
+            controller_impl->GetAnimation(AnimationTargetProperty::OPACITY)
+                ->run_state());
   // The impl thread controller should have de-activated.
   EXPECT_EQ(0u,
             registrar_impl->active_animation_controllers_for_testing().size());
 
   EXPECT_EQ(1u, events->events_.size());
   controller->NotifyAnimationFinished(events->events_[0]);
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1500));
   controller->UpdateState(true, nullptr);
 
-  EXPECT_EQ(Animation::WAITING_FOR_DELETION,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::WAITING_FOR_DELETION,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   // The main thread controller should have de-activated.
   EXPECT_EQ(0u, registrar->active_animation_controllers_for_testing().size());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller->has_any_animation());
   EXPECT_FALSE(controller_impl->has_any_animation());
   EXPECT_EQ(0u, registrar->active_animation_controllers_for_testing().size());
   EXPECT_EQ(0u,
             registrar_impl->active_animation_controllers_for_testing().size());
 
   controller->SetAnimationRegistrar(nullptr);
   controller_impl->SetAnimationRegistrar(nullptr);
 }
 
 TEST(LayerAnimationControllerTest, SyncPause) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
-  EXPECT_FALSE(controller_impl->GetAnimation(Animation::OPACITY));
+  EXPECT_FALSE(controller_impl->GetAnimation(AnimationTargetProperty::OPACITY));
 
   // Two steps, three ranges: [0-1) -> 0.2, [1-2) -> 0.3, [2-3] -> 0.4.
   const double duration = 3.0;
   const int animation_id =
       AddOpacityStepsToController(controller.get(), duration, 0.2f, 0.4f, 2);
 
   // Set start offset to be at the beginning of the second range.
   controller->GetAnimationById(animation_id)
       ->set_time_offset(TimeDelta::FromSecondsD(1.01));
 
@@ skipping 56 matching lines @@
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
 
-  EXPECT_FALSE(controller_impl->GetAnimation(Animation::OPACITY));
+  EXPECT_FALSE(controller_impl->GetAnimation(AnimationTargetProperty::OPACITY));
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller_impl->GetAnimationById(animation_id)->run_state());
@@ skipping 63 matching lines @@
                            TimeDelta::FromMilliseconds(2000));
   controller_impl->UpdateState(true, events.get());
 
   EXPECT_TRUE(dummy_impl.animation_waiting_for_deletion());
 
   // There should be a FINISHED event for the animation.
   EXPECT_EQ(1u, events->events_.size());
   EXPECT_EQ(AnimationEvent::FINISHED, events->events_[0].type);
 
   // Neither controller should have deleted the animation yet.
-  EXPECT_TRUE(controller->GetAnimation(Animation::OPACITY));
-  EXPECT_TRUE(controller_impl->GetAnimation(Animation::OPACITY));
+  EXPECT_TRUE(controller->GetAnimation(AnimationTargetProperty::OPACITY));
+  EXPECT_TRUE(controller_impl->GetAnimation(AnimationTargetProperty::OPACITY));
 
   controller->NotifyAnimationFinished(events->events_[0]);
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(3000));
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(dummy.animation_waiting_for_deletion());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
 
   // Both controllers should now have deleted the animation. The impl controller
@@ skipping 18 matching lines @@
 
 TEST(LayerAnimationControllerTest, TrivialTransition) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   EXPECT_FALSE(controller->needs_to_start_animations_for_testing());
   controller->AddAnimation(std::move(to_add));
   EXPECT_TRUE(controller->needs_to_start_animations_for_testing());
   controller->Animate(kInitialTickTime);
   EXPECT_FALSE(controller->needs_to_start_animations_for_testing());
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   // A non-impl-only animation should not generate property updates.
   const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());
   EXPECT_FALSE(event);
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(1.f, dummy.opacity());
   EXPECT_FALSE(controller->HasActiveAnimation());
   event = GetMostRecentPropertyUpdateEvent(events.get());
   EXPECT_FALSE(event);
 }
 
 TEST(LayerAnimationControllerTest, TrivialTransitionOnImpl) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_is_impl_only(true);
 
   controller_impl->AddAnimation(std::move(to_add));
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy_impl.opacity());
   EXPECT_EQ(1u, events->events_.size());
   const AnimationEvent* start_opacity_event =
       GetMostRecentPropertyUpdateEvent(events.get());
@@ skipping 26 matching lines @@
       KeyframedTransformAnimationCurve::Create());
 
   // Create simple TRANSFORM animation.
   TransformOperations operations;
   curve->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations, nullptr));
   operations.AppendTranslate(delta_x, delta_y, 0);
   curve->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::TRANSFORM));
   animation->set_is_impl_only(true);
   controller_impl->AddAnimation(std::move(animation));
 
   // Run animation.
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(gfx::Transform(), dummy_impl.transform());
   EXPECT_EQ(1u, events->events_.size());
   const AnimationEvent* start_transform_event =
@@ skipping 29 matching lines @@
 
   FilterOperations start_filters;
   start_filters.Append(FilterOperation::CreateBrightnessFilter(1.f));
   curve->AddKeyframe(
       FilterKeyframe::Create(base::TimeDelta(), start_filters, nullptr));
   FilterOperations end_filters;
   end_filters.Append(FilterOperation::CreateBrightnessFilter(2.f));
   curve->AddKeyframe(FilterKeyframe::Create(base::TimeDelta::FromSecondsD(1.0),
                                             end_filters, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::FILTER));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::FILTER));
   controller->AddAnimation(std::move(animation));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(start_filters, dummy.filters());
   // A non-impl-only animation should not generate property updates.
   const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());
   EXPECT_FALSE(event);
 
@@ skipping 26 matching lines @@
   // Create simple FILTER animation.
   FilterOperations start_filters;
   start_filters.Append(FilterOperation::CreateBrightnessFilter(1.f));
   curve->AddKeyframe(
       FilterKeyframe::Create(base::TimeDelta(), start_filters, nullptr));
   FilterOperations end_filters;
   end_filters.Append(FilterOperation::CreateBrightnessFilter(2.f));
   curve->AddKeyframe(FilterKeyframe::Create(base::TimeDelta::FromSecondsD(1.0),
                                             end_filters, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::FILTER));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::FILTER));
   animation->set_is_impl_only(true);
   controller_impl->AddAnimation(std::move(animation));
 
   // Run animation.
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(start_filters, dummy_impl.filters());
   EXPECT_EQ(1u, events->events_.size());
   const AnimationEvent* start_filter_event =
@@ skipping 29 matching lines @@
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   controller->set_value_provider(&dummy_provider);
 
   gfx::ScrollOffset initial_value(100.f, 300.f);
   gfx::ScrollOffset target_value(300.f, 200.f);
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::SCROLL_OFFSET));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::SCROLL_OFFSET));
   animation->set_needs_synchronized_start_time(true);
   controller->AddAnimation(std::move(animation));
 
   dummy_provider_impl.set_scroll_offset(initial_value);
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
-  EXPECT_TRUE(controller_impl->GetAnimation(Animation::SCROLL_OFFSET));
-  TimeDelta duration = controller_impl->GetAnimation(Animation::SCROLL_OFFSET)
-                           ->curve()
-                           ->Duration();
-  EXPECT_EQ(
-      duration,
-      controller->GetAnimation(Animation::SCROLL_OFFSET)->curve()->Duration());
+  EXPECT_TRUE(
+      controller_impl->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET));
+  TimeDelta duration =
+      controller_impl->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET)
+          ->curve()
+          ->Duration();
+  EXPECT_EQ(duration,
+            controller->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET)
+                ->curve()
+                ->Duration());
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(initial_value, dummy.scroll_offset());
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(initial_value, dummy_impl.scroll_offset());
@@ skipping 42 matching lines @@
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   controller->set_value_provider(&dummy_provider);
 
   gfx::ScrollOffset initial_value(500.f, 100.f);
   gfx::ScrollOffset target_value(300.f, 200.f);
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::SCROLL_OFFSET));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::SCROLL_OFFSET));
   animation->set_needs_synchronized_start_time(true);
   controller->AddAnimation(std::move(animation));
 
   dummy_provider.set_scroll_offset(initial_value);
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
-  EXPECT_TRUE(controller_impl->GetAnimation(Animation::SCROLL_OFFSET));
-  TimeDelta duration = controller_impl->GetAnimation(Animation::SCROLL_OFFSET)
-                           ->curve()
-                           ->Duration();
-  EXPECT_EQ(
-      duration,
-      controller->GetAnimation(Animation::SCROLL_OFFSET)->curve()->Duration());
+  EXPECT_TRUE(
+      controller_impl->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET));
+  TimeDelta duration =
+      controller_impl->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET)
+          ->curve()
+          ->Duration();
+  EXPECT_EQ(duration,
+            controller->GetAnimation(AnimationTargetProperty::SCROLL_OFFSET)
+                ->curve()
+                ->Duration());
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(initial_value, dummy.scroll_offset());
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(initial_value, dummy_impl.scroll_offset());
@@ skipping 35 matching lines @@
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
 
   gfx::ScrollOffset initial_value(100.f, 300.f);
   gfx::ScrollOffset target_value(300.f, 200.f);
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
   curve->SetInitialValue(initial_value);
   double duration_in_seconds = curve->Duration().InSecondsF();
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve), 1, 0, Animation::SCROLL_OFFSET));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve), 1, 0, AnimationTargetProperty::SCROLL_OFFSET));
   animation->set_is_impl_only(true);
   controller_impl->AddAnimation(std::move(animation));
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
   EXPECT_TRUE(controller_impl->HasActiveAnimation());
   EXPECT_EQ(initial_value, dummy_impl.scroll_offset());
   // Scroll offset animations should not generate property updates.
   const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());
   EXPECT_FALSE(event);
@@ skipping 31 matching lines @@
   controller->AddValueObserver(&dummy);
   controller->set_value_provider(&dummy_provider);
 
   // First test the 1-argument version of RemoveAnimation.
   gfx::ScrollOffset target_value(300.f, 200.f);
   scoped_ptr<ScrollOffsetAnimationCurve> curve(
       ScrollOffsetAnimationCurve::Create(target_value,
                                          EaseInOutTimingFunction::Create()));
 
   int animation_id = 1;
-  scoped_ptr<Animation> animation(Animation::Create(
-      std::move(curve), animation_id, 0, Animation::SCROLL_OFFSET));
+  scoped_ptr<Animation> animation(
+      Animation::Create(std::move(curve), animation_id, 0,
+                        AnimationTargetProperty::SCROLL_OFFSET));
   animation->set_needs_synchronized_start_time(true);
   controller->AddAnimation(std::move(animation));
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller->scroll_offset_animation_was_interrupted());
   EXPECT_FALSE(controller_impl->scroll_offset_animation_was_interrupted());
 
   controller->RemoveAnimation(animation_id);
   EXPECT_TRUE(controller->scroll_offset_animation_was_interrupted());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   EXPECT_TRUE(controller_impl->scroll_offset_animation_was_interrupted());
   EXPECT_FALSE(controller->scroll_offset_animation_was_interrupted());
 
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller_impl->scroll_offset_animation_was_interrupted());
 
   // Now, test the 2-argument version of RemoveAnimation.
   curve = ScrollOffsetAnimationCurve::Create(target_value,
                                              EaseInOutTimingFunction::Create());
   animation = Animation::Create(std::move(curve), animation_id, 0,
-                                Animation::SCROLL_OFFSET);
+                                AnimationTargetProperty::SCROLL_OFFSET);
   animation->set_needs_synchronized_start_time(true);
   controller->AddAnimation(std::move(animation));
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller->scroll_offset_animation_was_interrupted());
   EXPECT_FALSE(controller_impl->scroll_offset_animation_was_interrupted());
 
   controller->RemoveAnimation(animation_id);
   EXPECT_TRUE(controller->scroll_offset_animation_was_interrupted());
 
@@ skipping 42 matching lines @@
 
 class FakeAnimationDelegate : public AnimationDelegate {
  public:
   FakeAnimationDelegate()
       : started_(false),
         finished_(false),
         aborted_(false),
         start_time_(base::TimeTicks()) {}
 
   void NotifyAnimationStarted(TimeTicks monotonic_time,
-                              Animation::TargetProperty target_property,
+                              AnimationTargetProperty::Enum target_property,
                               int group) override {
     started_ = true;
     start_time_ = monotonic_time;
   }
 
   void NotifyAnimationFinished(TimeTicks monotonic_time,
-                               Animation::TargetProperty target_property,
+                               AnimationTargetProperty::Enum target_property,
                                int group) override {
     finished_ = true;
   }
 
   void NotifyAnimationAborted(TimeTicks monotonic_time,
-                              Animation::TargetProperty target_property,
+                              AnimationTargetProperty::Enum target_property,
                               int group) override {
     aborted_ = true;
   }
 
   bool started() { return started_; }
 
   bool finished() { return finished_; }
 
   bool aborted() { return aborted_; }
 
@@ skipping 13 matching lines @@
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeAnimationDelegate delegate;
   controller_impl->set_layer_animation_delegate(&delegate);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_is_impl_only(true);
   controller_impl->AddAnimation(std::move(to_add));
 
   EXPECT_FALSE(delegate.started());
   EXPECT_FALSE(delegate.finished());
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   EXPECT_TRUE(delegate.started());
@@ skipping 19 matching lines @@
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   FakeAnimationDelegate delegate;
   controller->set_layer_animation_delegate(&delegate);
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
 
   const TimeTicks start_time = TicksFromSecondsF(123);
-  controller->GetAnimation(Animation::OPACITY)->set_start_time(start_time);
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
+      ->set_start_time(start_time);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller_impl->GetAnimationById(animation_id)->run_state());
 
   AnimationEvents events;
   controller_impl->Animate(kInitialTickTime);
@@ skipping 31 matching lines @@
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   FakeLayerAnimationEventObserver observer;
   controller->AddEventObserver(&observer);
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 0, 1, false);
 
   const TimeTicks start_time = TicksFromSecondsF(123);
-  controller->GetAnimation(Animation::OPACITY)->set_start_time(start_time);
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
+      ->set_start_time(start_time);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller_impl->GetAnimationById(animation_id)->run_state());
 
   AnimationEvents events;
   controller_impl->Animate(kInitialTickTime);
@@ skipping 12 matching lines @@
 TEST(LayerAnimationControllerTest,
      AnimationsWaitingForStartTimeDoNotFinishIfTheyOutwaitTheirFinish) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_needs_synchronized_start_time(true);
 
   // We should pause at the first keyframe indefinitely waiting for that
   // animation to start.
   controller->AddAnimation(std::move(to_add));
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
 
   // Send the synchronized start time.
-  controller->NotifyAnimationStarted(
-      AnimationEvent(AnimationEvent::STARTED, 0, 1, Animation::OPACITY,
-                     kInitialTickTime + TimeDelta::FromMilliseconds(2000)));
+  controller->NotifyAnimationStarted(AnimationEvent(
+      AnimationEvent::STARTED, 0, 1, AnimationTargetProperty::OPACITY,
+      kInitialTickTime + TimeDelta::FromMilliseconds(2000)));
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(5000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(1.f, dummy.opacity());
   EXPECT_FALSE(controller->HasActiveAnimation());
 }
 
 // Tests that two queued animations affecting the same property run in sequence.
 TEST(LayerAnimationControllerTest, TrivialQueuing) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   EXPECT_FALSE(controller->needs_to_start_animations_for_testing());
 
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 1.f, 0.5f)), 2,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   EXPECT_TRUE(controller->needs_to_start_animations_for_testing());
 
   controller->Animate(kInitialTickTime);
 
   // The second animation still needs to be started.
   EXPECT_TRUE(controller->needs_to_start_animations_for_testing());
 
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
@@ skipping 14 matching lines @@
 
 // Tests interrupting a transition with another transition.
 TEST(LayerAnimationControllerTest, Interrupt) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 1.f, 0.5f)), 2,
-      Animation::OPACITY));
-  controller->AbortAnimations(Animation::OPACITY);
+      AnimationTargetProperty::OPACITY));
+  controller->AbortAnimations(AnimationTargetProperty::OPACITY);
   controller->AddAnimation(std::move(to_add));
 
   // Since the previous animation was aborted, the new animation should start
   // right in this call to animate.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(500));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(1.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1500));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(0.5f, dummy.opacity());
   EXPECT_FALSE(controller->HasActiveAnimation());
 }
 
 // Tests scheduling two animations to run together when only one property is
 // free.
 TEST(LayerAnimationControllerTest, ScheduleTogetherWhenAPropertyIsBlocked) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1)), 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1)), 2,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 2,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_EQ(0.f, dummy.opacity());
   EXPECT_TRUE(controller->HasActiveAnimation());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, events.get());
   // Should not have started the float transition yet.
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   // The float animation should have started at time 1 and should be done.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(1.f, dummy.opacity());
   EXPECT_FALSE(controller->HasActiveAnimation());
 }
 
 // Tests scheduling two animations to run together with different lengths and
 // another animation queued to start when the shorter animation finishes (should
 // wait for both to finish).
 TEST(LayerAnimationControllerTest, ScheduleTogetherWithAnAnimWaiting) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(2)), 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 1.f, 0.5f)), 2,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   // Animations with id 1 should both start now.
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   // The opacity animation should have finished at time 1, but the group
   // of animations with id 1 don't finish until time 2 because of the length
   // of the transform animation.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
@@ skipping 13 matching lines @@
 // Test that a looping animation loops and for the correct number of iterations.
 TEST(LayerAnimationControllerTest, TrivialLooping) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_iterations(3);
   controller->AddAnimation(std::move(to_add));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1250));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
@@ skipping 24 matching lines @@
 // Test that an infinitely looping animation does indeed go until aborted.
 TEST(LayerAnimationControllerTest, InfiniteLooping) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_iterations(-1);
   controller->AddAnimation(std::move(to_add));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1250));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.25f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1750));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.75f, dummy.opacity());
 
   controller->Animate(kInitialTickTime +
                       TimeDelta::FromMilliseconds(1073741824250));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.25f, dummy.opacity());
   controller->Animate(kInitialTickTime +
                       TimeDelta::FromMilliseconds(1073741824750));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.75f, dummy.opacity());
 
-  EXPECT_TRUE(controller->GetAnimation(Animation::OPACITY));
-  controller->GetAnimation(Animation::OPACITY)
+  EXPECT_TRUE(controller->GetAnimation(AnimationTargetProperty::OPACITY));
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
       ->SetRunState(Animation::ABORTED,
                     kInitialTickTime + TimeDelta::FromMilliseconds(750));
   EXPECT_FALSE(controller->HasActiveAnimation());
   EXPECT_EQ(0.75f, dummy.opacity());
 }
 
 // Test that pausing and resuming work as expected.
 TEST(LayerAnimationControllerTest, PauseResume) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(500));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.5f, dummy.opacity());
 
-  EXPECT_TRUE(controller->GetAnimation(Animation::OPACITY));
-  controller->GetAnimation(Animation::OPACITY)
+  EXPECT_TRUE(controller->GetAnimation(AnimationTargetProperty::OPACITY));
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
       ->SetRunState(Animation::PAUSED,
                     kInitialTickTime + TimeDelta::FromMilliseconds(500));
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1024000));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.5f, dummy.opacity());
 
-  EXPECT_TRUE(controller->GetAnimation(Animation::OPACITY));
-  controller->GetAnimation(Animation::OPACITY)
+  EXPECT_TRUE(controller->GetAnimation(AnimationTargetProperty::OPACITY));
+  controller->GetAnimation(AnimationTargetProperty::OPACITY)
       ->SetRunState(Animation::RUNNING,
                     kInitialTickTime + TimeDelta::FromMilliseconds(1024000));
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1024250));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.75f, dummy.opacity());
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1024500));
   controller->UpdateState(true, events.get());
   EXPECT_FALSE(controller->HasActiveAnimation());
   EXPECT_EQ(1.f, dummy.opacity());
 }
 
 TEST(LayerAnimationControllerTest, AbortAGroupedAnimation) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   const int animation_id = 2;
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1)), 1, 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(2.0, 0.f, 1.f)),
-      animation_id, 1, Animation::OPACITY));
+      animation_id, 1, AnimationTargetProperty::OPACITY));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 1.f, 0.75f)), 3,
-      2, Animation::OPACITY));
+      2, AnimationTargetProperty::OPACITY));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.f, dummy.opacity());
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_EQ(0.5f, dummy.opacity());
 
@@ skipping 17 matching lines @@
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> to_add(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(2.0, 0.f, 1.f)), 0,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   to_add->set_needs_synchronized_start_time(true);
   controller->AddAnimation(std::move(to_add));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_TRUE(controller->HasActiveAnimation());
-  Animation* active_animation = controller->GetAnimation(Animation::OPACITY);
+  Animation* active_animation =
+      controller->GetAnimation(AnimationTargetProperty::OPACITY);
   EXPECT_TRUE(active_animation);
   EXPECT_TRUE(active_animation->needs_synchronized_start_time());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
 
-  active_animation = controller_impl->GetAnimation(Animation::OPACITY);
+  active_animation =
+      controller_impl->GetAnimation(AnimationTargetProperty::OPACITY);
   EXPECT_TRUE(active_animation);
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             active_animation->run_state());
 }
 
 // Tests that skipping a call to UpdateState works as expected.
 TEST(LayerAnimationControllerTest, SkipUpdateState) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   scoped_ptr<Animation> first_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1)), 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   first_animation->set_is_controlling_instance_for_test(true);
   controller->AddAnimation(std::move(first_animation));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
 
   scoped_ptr<Animation> second_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 2,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   second_animation->set_is_controlling_instance_for_test(true);
   controller->AddAnimation(std::move(second_animation));
 
   // Animate but don't UpdateState.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   events.reset(new AnimationEvents);
   controller->UpdateState(true, events.get());
 
@@ skipping 18 matching lines @@
 TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy;
   FakeInactiveLayerAnimationValueObserver pending_dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
 
   const int id = 1;
   controller->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.5f, 1.f)), id,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   // Without an observer, the animation shouldn't progress to the STARTING
   // state.
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
   EXPECT_EQ(0u, events->events_.size());
-  EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::WAITING_FOR_TARGET_AVAILABILITY,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
 
   controller->AddValueObserver(&pending_dummy);
 
   // With only a pending observer, the animation should progress to the
   // STARTING state and get ticked at its starting point, but should not
   // progress to RUNNING.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(0u, events->events_.size());
-  EXPECT_EQ(Animation::STARTING,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::STARTING,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_EQ(0.5f, pending_dummy.opacity());
 
   // Even when already in the STARTING state, the animation should stay
   // there, and shouldn't be ticked past its starting point.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(0u, events->events_.size());
-  EXPECT_EQ(Animation::STARTING,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::STARTING,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_EQ(0.5f, pending_dummy.opacity());
 
   controller->AddValueObserver(&dummy);
 
   // Now that an active observer has been added, the animation should still
   // initially tick at its starting point, but should now progress to RUNNING.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(3000));
   controller->UpdateState(true, events.get());
   EXPECT_EQ(1u, events->events_.size());
-  EXPECT_EQ(Animation::RUNNING,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::RUNNING,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_EQ(0.5f, pending_dummy.opacity());
   EXPECT_EQ(0.5f, dummy.opacity());
 
   // The animation should now tick past its starting point.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(3500));
   EXPECT_NE(0.5f, pending_dummy.opacity());
   EXPECT_NE(0.5f, dummy.opacity());
 }
 
 TEST(LayerAnimationControllerTest, TransformAnimationBounds) {
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve1(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations1;
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   operations1.AppendTranslate(10.0, 15.0, 0.0);
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations1, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve1), 1, 1, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve1), 1, 1, AnimationTargetProperty::TRANSFORM));
   controller_impl->AddAnimation(std::move(animation));
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve2(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations2;
   curve2->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations2, nullptr));
   operations2.AppendScale(2.0, 3.0, 4.0);
   curve2->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
 
-  animation = Animation::Create(std::move(curve2), 2, 2, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve2), 2, 2,
+                                AnimationTargetProperty::TRANSFORM);
   controller_impl->AddAnimation(std::move(animation));
 
   gfx::BoxF box(1.f, 2.f, -1.f, 3.f, 4.f, 5.f);
   gfx::BoxF bounds;
 
   EXPECT_TRUE(controller_impl->TransformAnimationBoundsForBox(box, &bounds));
   EXPECT_EQ(gfx::BoxF(1.f, 2.f, -4.f, 13.f, 19.f, 20.f).ToString(),
             bounds.ToString());
 
   controller_impl->GetAnimationById(1)
@@ skipping 14 matching lines @@
   scoped_ptr<KeyframedTransformAnimationCurve> curve3(
       KeyframedTransformAnimationCurve::Create());
   TransformOperations operations3;
   gfx::Transform transform3;
   transform3.Scale3d(1.0, 2.0, 3.0);
   curve3->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations3, nullptr));
   operations3.AppendMatrix(transform3);
   curve3->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations3, nullptr));
-  animation = Animation::Create(std::move(curve3), 3, 3, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve3), 3, 3,
+                                AnimationTargetProperty::TRANSFORM);
   controller_impl->AddAnimation(std::move(animation));
   EXPECT_FALSE(controller_impl->TransformAnimationBoundsForBox(box, &bounds));
 }
 
 // Tests that AbortAnimations aborts all animations targeting the specified
 // property.
 TEST(LayerAnimationControllerTest, AbortAnimations) {
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   // Start with several animations, and allow some of them to reach the finished
   // state.
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)), 1, 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 2, 2,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)), 3, 3,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(2.0)), 4, 4,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   controller->AddAnimation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 5, 5,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, nullptr);
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
   controller->UpdateState(true, nullptr);
 
   EXPECT_EQ(Animation::FINISHED, controller->GetAnimationById(1)->run_state());
   EXPECT_EQ(Animation::FINISHED, controller->GetAnimationById(2)->run_state());
   EXPECT_EQ(Animation::RUNNING, controller->GetAnimationById(3)->run_state());
   EXPECT_EQ(Animation::WAITING_FOR_TARGET_AVAILABILITY,
             controller->GetAnimationById(4)->run_state());
   EXPECT_EQ(Animation::RUNNING, controller->GetAnimationById(5)->run_state());
 
-  controller->AbortAnimations(Animation::TRANSFORM);
+  controller->AbortAnimations(AnimationTargetProperty::TRANSFORM);
 
   // Only un-finished TRANSFORM animations should have been aborted.
   EXPECT_EQ(Animation::FINISHED, controller->GetAnimationById(1)->run_state());
   EXPECT_EQ(Animation::FINISHED, controller->GetAnimationById(2)->run_state());
   EXPECT_EQ(Animation::ABORTED, controller->GetAnimationById(3)->run_state());
   EXPECT_EQ(Animation::ABORTED, controller->GetAnimationById(4)->run_state());
   EXPECT_EQ(Animation::RUNNING, controller->GetAnimationById(5)->run_state());
 }
 
 // An animation aborted on the main thread should get deleted on both threads.
 TEST(LayerAnimationControllerTest, MainThreadAbortedAnimationGetsDeleted) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1.0, 0.f, 1.f, false);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
 
-  controller->AbortAnimations(Animation::OPACITY);
-  EXPECT_EQ(Animation::ABORTED,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  controller->AbortAnimations(AnimationTargetProperty::OPACITY);
+  EXPECT_EQ(
+      Animation::ABORTED,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_FALSE(dummy.animation_waiting_for_deletion());
   EXPECT_FALSE(dummy_impl.animation_waiting_for_deletion());
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, nullptr);
   EXPECT_FALSE(dummy.animation_waiting_for_deletion());
-  EXPECT_EQ(Animation::ABORTED,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::ABORTED,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   EXPECT_FALSE(controller->GetAnimationById(animation_id));
   EXPECT_FALSE(controller_impl->GetAnimationById(animation_id));
 }
 
 // An animation aborted on the impl thread should get deleted on both threads.
 TEST(LayerAnimationControllerTest, ImplThreadAbortedAnimationGetsDeleted) {
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
   FakeAnimationDelegate delegate;
   controller->set_layer_animation_delegate(&delegate);
 
   int animation_id =
       AddOpacityTransitionToController(controller.get(), 1.0, 0.f, 1.f, false);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id));
 
-  controller_impl->AbortAnimations(Animation::OPACITY);
+  controller_impl->AbortAnimations(AnimationTargetProperty::OPACITY);
   EXPECT_EQ(Animation::ABORTED,
-            controller_impl->GetAnimation(Animation::OPACITY)->run_state());
+            controller_impl->GetAnimation(AnimationTargetProperty::OPACITY)
+                ->run_state());
   EXPECT_FALSE(dummy.animation_waiting_for_deletion());
   EXPECT_FALSE(dummy_impl.animation_waiting_for_deletion());
 
   AnimationEvents events;
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, &events);
   EXPECT_TRUE(dummy_impl.animation_waiting_for_deletion());
   EXPECT_EQ(1u, events.events_.size());
   EXPECT_EQ(AnimationEvent::ABORTED, events.events_[0].type);
   EXPECT_EQ(Animation::WAITING_FOR_DELETION,
-            controller_impl->GetAnimation(Animation::OPACITY)->run_state());
+            controller_impl->GetAnimation(AnimationTargetProperty::OPACITY)
+                ->run_state());
 
   controller->NotifyAnimationAborted(events.events_[0]);
-  EXPECT_EQ(Animation::ABORTED,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::ABORTED,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
   EXPECT_TRUE(delegate.aborted());
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(500));
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(dummy.animation_waiting_for_deletion());
-  EXPECT_EQ(Animation::WAITING_FOR_DELETION,
-            controller->GetAnimation(Animation::OPACITY)->run_state());
+  EXPECT_EQ(
+      Animation::WAITING_FOR_DELETION,
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->run_state());
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   EXPECT_FALSE(controller->GetAnimationById(animation_id));
   EXPECT_FALSE(controller_impl->GetAnimationById(animation_id));
 }
 
 // Ensure that we only generate FINISHED events for animations in a group
 // once all animations in that group are finished.
 TEST(LayerAnimationControllerTest, FinishedEventsForGroup) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
 
   const int group_id = 1;
 
   // Add two animations with the same group id but different durations.
   scoped_ptr<Animation> first_animation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(2.0)), 1, group_id,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   first_animation->set_is_controlling_instance_for_test(true);
   controller_impl->AddAnimation(std::move(first_animation));
 
   scoped_ptr<Animation> second_animation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 2,
-      group_id, Animation::OPACITY));
+      group_id, AnimationTargetProperty::OPACITY));
   second_animation->set_is_controlling_instance_for_test(true);
   controller_impl->AddAnimation(std::move(second_animation));
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   // Both animations should have started.
   EXPECT_EQ(2u, events->events_.size());
   EXPECT_EQ(AnimationEvent::STARTED, events->events_[0].type);
   EXPECT_EQ(AnimationEvent::STARTED, events->events_[1].type);
@@ skipping 27 matching lines @@
 TEST(LayerAnimationControllerTest, FinishedAndAbortedEventsForGroup) {
   scoped_ptr<AnimationEvents> events(make_scoped_ptr(new AnimationEvents));
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
 
   // Add two animations with the same group id.
   scoped_ptr<Animation> first_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)), 1,
-      Animation::TRANSFORM));
+      AnimationTargetProperty::TRANSFORM));
   first_animation->set_is_controlling_instance_for_test(true);
   controller_impl->AddAnimation(std::move(first_animation));
 
   scoped_ptr<Animation> second_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   second_animation->set_is_controlling_instance_for_test(true);
   controller_impl->AddAnimation(std::move(second_animation));
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   // Both animations should have started.
   EXPECT_EQ(2u, events->events_.size());
   EXPECT_EQ(AnimationEvent::STARTED, events->events_[0].type);
   EXPECT_EQ(AnimationEvent::STARTED, events->events_[1].type);
 
-  controller_impl->AbortAnimations(Animation::OPACITY);
+  controller_impl->AbortAnimations(AnimationTargetProperty::OPACITY);
 
   events.reset(new AnimationEvents);
   controller_impl->Animate(kInitialTickTime +
                            TimeDelta::FromMilliseconds(1000));
   controller_impl->UpdateState(true, events.get());
 
   // We should have exactly 2 events: a FINISHED event for the tranform
   // animation, and an ABORTED event for the opacity animation.
   EXPECT_EQ(2u, events->events_.size());
   EXPECT_EQ(AnimationEvent::FINISHED, events->events_[0].type);
-  EXPECT_EQ(Animation::TRANSFORM, events->events_[0].target_property);
+  EXPECT_EQ(AnimationTargetProperty::TRANSFORM,
+            events->events_[0].target_property);
   EXPECT_EQ(AnimationEvent::ABORTED, events->events_[1].type);
-  EXPECT_EQ(Animation::OPACITY, events->events_[1].target_property);
+  EXPECT_EQ(AnimationTargetProperty::OPACITY,
+            events->events_[1].target_property);
 }
 
 TEST(LayerAnimationControllerTest, HasAnimationThatAffectsScale) {
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
 
   EXPECT_FALSE(controller_impl->HasAnimationThatAffectsScale());
 
   controller_impl->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   // Opacity animations don't affect scale.
   EXPECT_FALSE(controller_impl->HasAnimationThatAffectsScale());
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve1(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations1;
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   operations1.AppendTranslate(10.0, 15.0, 0.0);
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations1, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve1), 2, 2, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve1), 2, 2, AnimationTargetProperty::TRANSFORM));
   controller_impl->AddAnimation(std::move(animation));
 
   // Translations don't affect scale.
   EXPECT_FALSE(controller_impl->HasAnimationThatAffectsScale());
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve2(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations2;
   curve2->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations2, nullptr));
   operations2.AppendScale(2.0, 3.0, 4.0);
   curve2->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
 
-  animation = Animation::Create(std::move(curve2), 3, 3, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve2), 3, 3,
+                                AnimationTargetProperty::TRANSFORM);
   controller_impl->AddAnimation(std::move(animation));
 
   EXPECT_TRUE(controller_impl->HasAnimationThatAffectsScale());
 
   controller_impl->GetAnimationById(3)
       ->SetRunState(Animation::FINISHED, TicksFromSecondsF(0.0));
 
   // Only unfinished animations should be considered by
   // HasAnimationThatAffectsScale.
   EXPECT_FALSE(controller_impl->HasAnimationThatAffectsScale());
 }
 
 TEST(LayerAnimationControllerTest, HasOnlyTranslationTransforms) {
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
 
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::PENDING));
 
   controller_impl->AddAnimation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
 
   // Opacity animations aren't non-translation transforms.
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::PENDING));
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve1(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations1;
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   operations1.AppendTranslate(10.0, 15.0, 0.0);
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations1, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve1), 2, 2, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve1), 2, 2, AnimationTargetProperty::TRANSFORM));
   controller_impl->AddAnimation(std::move(animation));
 
   // The only transform animation we've added is a translation.
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::PENDING));
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve2(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations2;
   curve2->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations2, nullptr));
   operations2.AppendScale(2.0, 3.0, 4.0);
   curve2->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
 
-  animation = Animation::Create(std::move(curve2), 3, 3, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve2), 3, 3,
+                                AnimationTargetProperty::TRANSFORM);
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   // A scale animation is not a translation.
   EXPECT_FALSE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms(
       LayerAnimationController::ObserverType::ACTIVE));
 
   controller_impl->ActivateAnimations();
@@ skipping 25 matching lines @@
   scoped_ptr<KeyframedTransformAnimationCurve> curve1(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations1;
   operations1.AppendScale(2.0, 3.0, 4.0);
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   TransformOperations operations2;
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve1), 1, 1, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve1), 1, 1, AnimationTargetProperty::TRANSFORM));
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   float start_scale = 0.f;
   EXPECT_TRUE(controller_impl->AnimationStartScale(
       LayerAnimationController::ObserverType::PENDING, &start_scale));
   EXPECT_EQ(4.f, start_scale);
   EXPECT_TRUE(controller_impl->AnimationStartScale(
       LayerAnimationController::ObserverType::ACTIVE, &start_scale));
   EXPECT_EQ(0.f, start_scale);
@@ skipping 10 matching lines @@
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations3;
   curve2->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations3, nullptr));
   operations3.AppendScale(6.0, 5.0, 4.0);
   curve2->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations3, nullptr));
 
   controller_impl->RemoveAnimation(1);
-  animation = Animation::Create(std::move(curve2), 2, 2, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve2), 2, 2,
+                                AnimationTargetProperty::TRANSFORM);
 
   // Reverse Direction
   animation->set_direction(Animation::DIRECTION_REVERSE);
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve3(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations4;
   operations4.AppendScale(5.0, 3.0, 1.0);
   curve3->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations4, nullptr));
   TransformOperations operations5;
   curve3->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations5, nullptr));
 
-  animation = Animation::Create(std::move(curve3), 3, 3, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve3), 3, 3,
+                                AnimationTargetProperty::TRANSFORM);
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   EXPECT_TRUE(controller_impl->AnimationStartScale(
       LayerAnimationController::ObserverType::PENDING, &start_scale));
   EXPECT_EQ(6.f, start_scale);
   EXPECT_TRUE(controller_impl->AnimationStartScale(
       LayerAnimationController::ObserverType::ACTIVE, &start_scale));
   EXPECT_EQ(0.f, start_scale);
 
@@ skipping 33 matching lines @@
   scoped_ptr<KeyframedTransformAnimationCurve> curve1(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations1;
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   operations1.AppendScale(2.0, 3.0, 4.0);
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations1, nullptr));
 
-  scoped_ptr<Animation> animation(
-      Animation::Create(std::move(curve1), 1, 1, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation(Animation::Create(
+      std::move(curve1), 1, 1, AnimationTargetProperty::TRANSFORM));
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::PENDING, &max_scale));
   EXPECT_EQ(4.f, max_scale);
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::ACTIVE, &max_scale));
   EXPECT_EQ(0.f, max_scale);
 
   controller_impl->ActivateAnimations();
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::PENDING, &max_scale));
   EXPECT_EQ(4.f, max_scale);
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::ACTIVE, &max_scale));
   EXPECT_EQ(4.f, max_scale);
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve2(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations2;
   curve2->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations2, nullptr));
   operations2.AppendScale(6.0, 5.0, 4.0);
   curve2->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
 
-  animation = Animation::Create(std::move(curve2), 2, 2, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve2), 2, 2,
+                                AnimationTargetProperty::TRANSFORM);
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::PENDING, &max_scale));
   EXPECT_EQ(6.f, max_scale);
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::ACTIVE, &max_scale));
   EXPECT_EQ(4.f, max_scale);
 
   controller_impl->ActivateAnimations();
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::PENDING, &max_scale));
   EXPECT_EQ(6.f, max_scale);
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::ACTIVE, &max_scale));
   EXPECT_EQ(6.f, max_scale);
 
   scoped_ptr<KeyframedTransformAnimationCurve> curve3(
       KeyframedTransformAnimationCurve::Create());
 
   TransformOperations operations3;
   curve3->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations3, nullptr));
   operations3.AppendPerspective(6.0);
   curve3->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations3, nullptr));
 
-  animation = Animation::Create(std::move(curve3), 3, 3, Animation::TRANSFORM);
+  animation = Animation::Create(std::move(curve3), 3, 3,
+                                AnimationTargetProperty::TRANSFORM);
   animation->set_affects_active_observers(false);
   controller_impl->AddAnimation(std::move(animation));
 
   EXPECT_FALSE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::PENDING, &max_scale));
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
       LayerAnimationController::ObserverType::ACTIVE, &max_scale));
   EXPECT_EQ(6.f, max_scale);
 
   controller_impl->ActivateAnimations();
@@ skipping 25 matching lines @@
       KeyframedTransformAnimationCurve::Create());
   TransformOperations operations1;
   operations1.AppendScale(1.0, 2.0, 3.0);
   curve1->AddKeyframe(
       TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
   TransformOperations operations2;
   operations2.AppendScale(4.0, 5.0, 6.0);
   curve1->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
 
-  scoped_ptr<Animation> animation_owned(
-      Animation::Create(std::move(curve1), 1, 1, Animation::TRANSFORM));
+  scoped_ptr<Animation> animation_owned(Animation::Create(
+      std::move(curve1), 1, 1, AnimationTargetProperty::TRANSFORM));
   Animation* animation = animation_owned.get();
   controller_impl->AddAnimation(std::move(animation_owned));
 
   float max_scale = 0.f;
 
   EXPECT_GT(animation->playback_rate(), 0.0);
 
   // NORMAL direction with positive playback rate.
   animation->set_direction(Animation::DIRECTION_NORMAL);
   EXPECT_TRUE(controller_impl->MaximumTargetScale(
@@ skipping 283 matching lines @@
   EXPECT_TRUE(pending_dummy_impl.transform_is_animating());
   EXPECT_TRUE(active_dummy_impl.transform_is_animating());
 
   controller_impl->Animate(kInitialTickTime +
                            TimeDelta::FromMilliseconds(3000));
   controller_impl->UpdateState(true, &events);
 
   controller->NotifyAnimationStarted(events.events_[0]);
   events.events_.clear();
 
-  controller_impl->AbortAnimations(Animation::TRANSFORM);
+  controller_impl->AbortAnimations(AnimationTargetProperty::TRANSFORM);
   EXPECT_FALSE(pending_dummy_impl.transform_is_animating());
   EXPECT_FALSE(active_dummy_impl.transform_is_animating());
 
   controller_impl->Animate(kInitialTickTime +
                            TimeDelta::FromMilliseconds(4000));
   controller_impl->UpdateState(true, &events);
 
   controller->NotifyAnimationAborted(events.events_[0]);
   EXPECT_FALSE(dummy.transform_is_animating());
 }
@@ skipping 55 matching lines @@
   EXPECT_EQ(0.5f, pending_dummy_impl.opacity());
   EXPECT_EQ(0.5f, dummy_impl.opacity());
 
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id)
                   ->affects_pending_observers());
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id)
                   ->affects_active_observers());
 
   // Delete the animation on the main-thread controller.
   controller->RemoveAnimation(
-      controller->GetAnimation(Animation::OPACITY)->id());
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->id());
   controller->PushAnimationUpdatesTo(controller_impl.get());
 
   // The animation should no longer affect pending observers.
   EXPECT_FALSE(controller_impl->GetAnimationById(animation_id)
                    ->affects_pending_observers());
   EXPECT_TRUE(controller_impl->GetAnimationById(animation_id)
                   ->affects_active_observers());
 
   controller_impl->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(500));
   controller_impl->UpdateState(true, events.get());
@@ skipping 27 matching lines @@
       AddOpacityTransitionToController(controller.get(), 1, 0.f, 1.f, true);
 
   controller->PushAnimationUpdatesTo(controller_impl.get());
   controller_impl->ActivateAnimations();
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   // Remove the first animation from the main-thread controller, and add a
   // new animation affecting the same property.
   controller->RemoveAnimation(
-      controller->GetAnimation(Animation::OPACITY)->id());
+      controller->GetAnimation(AnimationTargetProperty::OPACITY)->id());
   int second_animation_id =
       AddOpacityTransitionToController(controller.get(), 1, 1.f, 0.5f, true);
   controller->PushAnimationUpdatesTo(controller_impl.get());
 
   // The original animation should only affect active observers, and the new
   // animation should only affect pending observers.
   EXPECT_FALSE(controller_impl->GetAnimationById(first_animation_id)
                    ->affects_pending_observers());
   EXPECT_TRUE(controller_impl->GetAnimationById(first_animation_id)
                   ->affects_active_observers());
@@ skipping 43 matching lines @@
 
 TEST(LayerAnimationControllerTest, TestIsCurrentlyAnimatingProperty) {
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   // Create an animation that initially affects only pending observers.
   scoped_ptr<Animation> animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   animation->set_affects_active_observers(false);
 
   controller->AddAnimation(std::move(animation));
   controller->Animate(kInitialTickTime);
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(controller->HasActiveAnimation());
 
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   controller->ActivateAnimations();
 
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(10));
   controller->UpdateState(true, nullptr);
 
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   EXPECT_EQ(0.f, dummy.opacity());
 
   // Tick past the end of the animation.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1100));
   controller->UpdateState(true, nullptr);
 
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   EXPECT_EQ(1.f, dummy.opacity());
 }
 
 TEST(LayerAnimationControllerTest, TestIsAnimatingPropertyTimeOffsetFillMode) {
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
   // Create an animation that initially affects only pending observers, and has
   // a start delay of 2 seconds.
   scoped_ptr<Animation> animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)), 1,
-      Animation::OPACITY));
+      AnimationTargetProperty::OPACITY));
   animation->set_fill_mode(Animation::FILL_MODE_NONE);
   animation->set_time_offset(TimeDelta::FromMilliseconds(-2000));
   animation->set_affects_active_observers(false);
 
   controller->AddAnimation(std::move(animation));
 
   controller->Animate(kInitialTickTime);
 
   // Since the animation has a start delay, the observers it affects have a
   // potentially running transform animation but aren't currently animating
   // transform.
   EXPECT_TRUE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   controller->ActivateAnimations();
 
   EXPECT_TRUE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller->HasActiveAnimation());
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::FILTER,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   controller->UpdateState(true, nullptr);
 
   // Tick past the start delay.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_TRUE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
 
   // After the animaton finishes, the observers it affects have neither a
   // potentially running transform animation nor a currently running transform
   // animation.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(4000));
   controller->UpdateState(true, nullptr);
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsPotentiallyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::PENDING));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::PENDING));
   EXPECT_FALSE(controller->IsCurrentlyAnimatingProperty(
-      Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE));
+      AnimationTargetProperty::OPACITY,
+      LayerAnimationController::ObserverType::ACTIVE));
 }
 
 }  // namespace
 }  // namespace cc