Update from https://crrev.com/304418

cc/layers/layer_perftest.cc

Index: cc/layers/layer_perftest.cc
diff --git a/cc/layers/layer_perftest.cc b/cc/layers/layer_perftest.cc
index f42e22812131aa1cecac394d36cb4e84c1ad74fd..0b4c8522abd1720871410bb12b9b393ce3ccffe5 100644
--- a/cc/layers/layer_perftest.cc
+++ b/cc/layers/layer_perftest.cc
@@ -37,13 +37,13 @@ class LayerPerfTest : public testing::Test {
                kTimeCheckInterval) {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_);
     layer_tree_host_->InitializeSingleThreaded(
         &fake_client_, base::MessageLoopProxy::current(), nullptr);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     layer_tree_host_->SetRootLayer(nullptr);
     layer_tree_host_ = nullptr;
   }