Update from https://crrev.com/312398

cc/test/animation_test_common.cc

 // 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.
 
 #include "cc/test/animation_test_common.h"
 
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/transform_operations.h"
@@ skipping 189 matching lines @@
 
 float FakeFloatTransition::GetValue(base::TimeDelta time) const {
   double progress = TimeUtil::Divide(time, duration_);
   if (progress >= 1.0)
     progress = 1.0;
   return (1.0 - progress) * from_ + progress * to_;
 }
 
 FakeLayerAnimationValueObserver::FakeLayerAnimationValueObserver()
     : opacity_(0.0f),
-      animation_waiting_for_deletion_(false) {}
+      animation_waiting_for_deletion_(false),
+      scroll_offset_animation_removed_(false) {
+}
 
 FakeLayerAnimationValueObserver::~FakeLayerAnimationValueObserver() {}
 
 void FakeLayerAnimationValueObserver::OnFilterAnimated(
     const FilterOperations& filters) {
   filters_ = filters;
 }
 
 void FakeLayerAnimationValueObserver::OnOpacityAnimated(float opacity) {
   opacity_ = opacity;
 }
 
 void FakeLayerAnimationValueObserver::OnTransformAnimated(
     const gfx::Transform& transform) {
   transform_ = transform;
 }
 
 void FakeLayerAnimationValueObserver::OnScrollOffsetAnimated(
     const gfx::ScrollOffset& scroll_offset) {
   scroll_offset_ = scroll_offset;
 }
 
 void FakeLayerAnimationValueObserver::OnAnimationWaitingForDeletion() {
   animation_waiting_for_deletion_ = true;
 }
 
+void FakeLayerAnimationValueObserver::OnScrollOffsetAnimationRemoved() {
+  scroll_offset_animation_removed_ = true;
+}
+
 bool FakeLayerAnimationValueObserver::IsActive() const {
   return true;
 }
 
 bool FakeInactiveLayerAnimationValueObserver::IsActive() const {
   return false;
 }
 
 gfx::ScrollOffset FakeLayerAnimationValueProvider::ScrollOffsetForAnimation()
     const {
@@ skipping 103 matching lines @@
                              double duration,
                              float start_brightness,
                              float end_brightness) {
   return AddAnimatedFilter(layer->layer_animation_controller(),
                            duration,
                            start_brightness,
                            end_brightness);
 }
 
 }  // namespace cc