Reland r107720 - Enable the new layer animation framework.

ui/gfx/compositor/layer_unittest.cc

Index: ui/gfx/compositor/layer_unittest.cc
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index a5e64febc619faf0bf0fda4ea86b353e51c9c233..eb66d63b33e4395a2116f6cf71dd138c13b10174 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -9,6 +9,7 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animation_sequence.h"
 #include "ui/gfx/compositor/test_compositor.h"
 #include "ui/gfx/compositor/test_compositor_host.h"
 
@@ -41,7 +42,8 @@ class ColoredLayer : public Layer, public LayerDelegate {
     canvas->GetSkCanvas()->drawColor(color_);
   }
 
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+  virtual void OnLayerAnimationEnded(
+      const LayerAnimationSequence* animation) OVERRIDE {
   }
 
  private:
@@ -132,7 +134,8 @@ class TestLayerDelegate : public LayerDelegate {
                         contents.height());
     color_index_ = (color_index_ + 1) % static_cast<int>(colors_.size());
   }
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+  virtual void OnLayerAnimationEnded(
+      const LayerAnimationSequence* animation) OVERRIDE {
   }
 
  private:
@@ -160,7 +163,8 @@ class DrawTreeLayerDelegate : public LayerDelegate {
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
     painted_ = true;
   }
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+  virtual void OnLayerAnimationEnded(
+      const LayerAnimationSequence* animation) OVERRIDE {
   }
 
   bool painted_;
@@ -178,7 +182,8 @@ class NullLayerDelegate : public LayerDelegate {
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
   }
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+  virtual void OnLayerAnimationEnded(
+      const LayerAnimationSequence* animation) OVERRIDE {
   }
 
   DISALLOW_COPY_AND_ASSIGN(NullLayerDelegate);