Update from https://crrev.com/309717

cc/animation/scrollbar_animation_controller_linear_fade_unittest.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/animation/scrollbar_animation_controller_linear_fade.h"
 
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
@@ skipping 12 matching lines @@
       : host_impl_(&proxy_, &shared_bitmap_manager_), needs_frame_count_(0) {}
 
   void PostDelayedScrollbarFade(const base::Closure& start_fade,
                                 base::TimeDelta delay) override {
     start_fade_ = start_fade;
     delay_ = delay;
   }
   void SetNeedsScrollbarAnimationFrame() override { needs_frame_count_++; }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     const int kThumbThickness = 10;
     const int kTrackStart = 0;
     const bool kIsLeftSideVerticalScrollbar = false;
     const bool kIsOverlayScrollbar = true;  // Allow opacity animations.
 
     scoped_ptr<LayerImpl> scroll_layer =
         LayerImpl::Create(host_impl_.active_tree(), 1);
     scrollbar_layer_ =
         SolidColorScrollbarLayerImpl::Create(host_impl_.active_tree(),
                                              2,
@@ skipping 366 matching lines @@
   scrollbar_controller_->DidScrollUpdate(false);
   EXPECT_FLOAT_EQ(1, scrollbar_layer_->opacity());
 
   time += base::TimeDelta::FromSeconds(1);
   scrollbar_controller_->DidScrollEnd();
   EXPECT_FLOAT_EQ(1, scrollbar_layer_->opacity());
 }
 
 }  // namespace
 }  // namespace cc