Update from https://crrev.com/312398

cc/animation/layer_animation_controller.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_LAYER_ANIMATION_CONTROLLER_H_
 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ skipping 47 matching lines @@
                                  AnimationEventsVector* events);
 
   void UpdateState(bool start_ready_animations,
                    AnimationEventsVector* events);
 
   // Make animations affect active observers if and only if they affect
   // pending observers. Any animations that no longer affect any observers
   // are deleted.
   void ActivateAnimations();
 
-  // Returns the active animation in the given group, animating the given
-  // property, if such an animation exists.
-  Animation* GetAnimation(int group_id,
-                          Animation::TargetProperty target_property) const;
-
   // Returns the active animation animating the given property that is either
   // running, or is next to run, if such an animation exists.
   Animation* GetAnimation(Animation::TargetProperty target_property) const;
 
+  // Returns the active animation for the given unique animation id.
+  Animation* GetAnimationById(int animation_id) const;
+
   // Returns true if there are any animations that have neither finished nor
   // aborted.
   bool HasActiveAnimation() const;
 
   // Returns true if there are any animations at all to process.
   bool has_any_animation() const { return !animations_.empty(); }
 
   // Returns true if there is an animation currently animating the given
   // property, or if there is an animation scheduled to animate this property in
   // the future.
@@ skipping 99 matching lines @@
   void NotifyObserversFilterAnimated(const FilterOperations& filter,
                                      bool notify_active_observers,
                                      bool notify_pending_observers);
   void NotifyObserversScrollOffsetAnimated(
       const gfx::ScrollOffset& scroll_offset,
       bool notify_active_observers,
       bool notify_pending_observers);
 
   void NotifyObserversAnimationWaitingForDeletion();
 
+  void NotifyObserversScrollOffsetAnimationRemoved();
+
   bool HasValueObserver();
   bool HasActiveValueObserver();
 
   AnimationRegistrar* registrar_;
   int id_;
   ScopedPtrVector<Animation> animations_;
 
   // This is used to ensure that we don't spam the registrar.
   bool is_active_;
 
   base::TimeTicks last_tick_time_;
 
   ObserverList<LayerAnimationValueObserver> value_observers_;
   ObserverList<LayerAnimationEventObserver> event_observers_;
 
   LayerAnimationValueProvider* value_provider_;
 
   AnimationDelegate* layer_animation_delegate_;
 
   // Only try to start animations when new animations are added or when the
   // previous attempt at starting animations failed to start all animations.
   bool needs_to_start_animations_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerAnimationController);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_