Update from https://crrev.com/320343

cc/animation/animation_registrar.h

Index: cc/animation/animation_registrar.h
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h
index 36c45c789049afec27223731ef745b8c962ba23a..530239096701cc5b12ab35aed65748a10140130e 100644
--- a/cc/animation/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -8,6 +8,7 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/animation/animation_events.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
@@ -43,11 +44,12 @@ class CC_EXPORT AnimationRegistrar {
   // Unregisters the given controller as alive.
   void UnregisterAnimationController(LayerAnimationController* controller);
 
-  const AnimationControllerMap& active_animation_controllers() const {
+  const AnimationControllerMap& active_animation_controllers_for_testing()
+      const {
     return active_animation_controllers_;
   }
 
-  const AnimationControllerMap& all_animation_controllers() const {
+  const AnimationControllerMap& all_animation_controllers_for_testing() const {
     return all_animation_controllers_;
   }
 
@@ -57,6 +59,21 @@ class CC_EXPORT AnimationRegistrar {
 
   bool supports_scroll_animations() { return supports_scroll_animations_; }
 
+  bool needs_animate_layers() const {
+    return !active_animation_controllers_.empty();
+  }
+
+  bool ActivateAnimations();
+  bool AnimateLayers(base::TimeTicks monotonic_time);
+  bool UpdateAnimationState(bool start_ready_animations,
+                            AnimationEventsVector* events);
+
+  scoped_ptr<AnimationEventsVector> CreateEvents() {
+    return make_scoped_ptr(new AnimationEventsVector());
+  }
+
+  void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events);
+
  private:
   AnimationRegistrar();