Update from https://crrev.com/320343

cc/animation/animation_registrar.h

 // 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.
 
 #ifndef CC_ANIMATION_ANIMATION_REGISTRAR_H_
 #define CC_ANIMATION_ANIMATION_REGISTRAR_H_
 
 #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 {
 
 class LayerAnimationController;
 
 class CC_EXPORT AnimationRegistrar {
  public:
   typedef base::hash_map<int, LayerAnimationController*> AnimationControllerMap;
 
@@ skipping 15 matching lines @@
   // animation controller will no longer be ticked (since it's not active). It
   // is not an error to call this function with a deactivated controller.
   void DidDeactivateAnimationController(LayerAnimationController* controller);
 
   // Registers the given controller as alive.
   void RegisterAnimationController(LayerAnimationController* controller);
 
   // 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_;
   }
 
   void set_supports_scroll_animations(bool supports_scroll_animations) {
     supports_scroll_animations_ = supports_scroll_animations;
   }
 
   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();
 
   AnimationControllerMap active_animation_controllers_;
   AnimationControllerMap all_animation_controllers_;
 
   bool supports_scroll_animations_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationRegistrar);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_REGISTRAR_H_