Update from https://crrev.com/312398

cc/test/animation_test_common.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_TEST_ANIMATION_TEST_COMMON_H_
 #define CC_TEST_ANIMATION_TEST_COMMON_H_
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 64 matching lines @@
  public:
   FakeLayerAnimationValueObserver();
   ~FakeLayerAnimationValueObserver() override;
 
   // LayerAnimationValueObserver implementation
   void OnFilterAnimated(const FilterOperations& filters) override;
   void OnOpacityAnimated(float opacity) override;
   void OnTransformAnimated(const gfx::Transform& transform) override;
   void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset) override;
   void OnAnimationWaitingForDeletion() override;
+  void OnScrollOffsetAnimationRemoved() override;
   bool IsActive() const override;
 
   const FilterOperations& filters() const { return filters_; }
   float opacity() const  { return opacity_; }
   const gfx::Transform& transform() const { return transform_; }
   gfx::ScrollOffset scroll_offset() { return scroll_offset_; }
 
   bool animation_waiting_for_deletion() {
     return animation_waiting_for_deletion_;
   }
 
+  bool scroll_offset_animation_removed() const {
+    return scroll_offset_animation_removed_;
+  }
+  void reset_scroll_offset_animation_removed() {
+    scroll_offset_animation_removed_ = false;
+  }
+
  private:
   FilterOperations filters_;
   float opacity_;
   gfx::Transform transform_;
   gfx::ScrollOffset scroll_offset_;
   bool animation_waiting_for_deletion_;
+  bool scroll_offset_animation_removed_;
 };
 
 class FakeInactiveLayerAnimationValueObserver
     : public FakeLayerAnimationValueObserver {
  public:
   bool IsActive() const override;
 };
 
 class FakeLayerAnimationValueProvider : public LayerAnimationValueProvider {
  public:
@@ skipping 61 matching lines @@
                              float end_brightness);
 
 int AddAnimatedFilterToLayer(LayerImpl* layer,
                              double duration,
                              float start_brightness,
                              float end_brightness);
 
 }  // namespace cc
 
 #endif  // CC_TEST_ANIMATION_TEST_COMMON_H_