Update from https://crrev.com/304418

cc/layers/picture_layer_impl_perftest.cc

 // Copyright 2014 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/layers/picture_layer_impl.h"
 
 #include "cc/debug/lap_timer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
@@ skipping 27 matching lines @@
  public:
   PictureLayerImplPerfTest()
       : proxy_(base::MessageLoopProxy::current()),
         host_impl_(ImplSidePaintingSettings(),
                    &proxy_,
                    &shared_bitmap_manager_),
         timer_(kWarmupRuns,
                base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                kTimeCheckInterval) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());
   }
 
   void SetupPendingTree(const gfx::Size& layer_bounds,
                         const gfx::Size& tile_size) {
     scoped_refptr<FakePicturePileImpl> pile =
         FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
     host_impl_.CreatePendingTree();
     LayerTreeImpl* pending_tree = host_impl_.pending_tree();
     pending_tree->DetachLayerTree();
@@ skipping 208 matching lines @@
 
   RunEvictionIteratorConstructTest("0_0_100x100", gfx::Rect(0, 0, 100, 100));
   RunEvictionIteratorConstructTest("5000_0_100x100",
                                    gfx::Rect(5000, 0, 100, 100));
   RunEvictionIteratorConstructTest("9999_0_100x100",
                                    gfx::Rect(9999, 0, 100, 100));
 }
 
 }  // namespace
 }  // namespace cc