Update from https://crrev.com/312398

cc/animation/layer_animation_controller.h

Index: cc/animation/layer_animation_controller.h
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 22c57b5e0d9f8a1bc21969d74c4730a0dd08f711..d776ee9cbd7de72e27eca1722cf6dcfd75ca797a 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -65,15 +65,13 @@ class CC_EXPORT LayerAnimationController
   // 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;
@@ -193,6 +191,8 @@ class CC_EXPORT LayerAnimationController
 
   void NotifyObserversAnimationWaitingForDeletion();
 
+  void NotifyObserversScrollOffsetAnimationRemoved();
+
   bool HasValueObserver();
   bool HasActiveValueObserver();