Update from https://crrev.com/304418

cc/layers/delegated_frame_resource_collection_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/transferable_resource.h"
 #include "cc/trees/blocking_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class DelegatedFrameResourceCollectionTest
     : public testing::Test,
       public DelegatedFrameResourceCollectionClient {
  protected:
   DelegatedFrameResourceCollectionTest() : resources_available_(false) {}
 
-  virtual void SetUp() override { CreateResourceCollection(); }
+  void SetUp() override { CreateResourceCollection(); }
 
-  virtual void TearDown() override { DestroyResourceCollection(); }
+  void TearDown() override { DestroyResourceCollection(); }
 
   void CreateResourceCollection() {
     DCHECK(!resource_collection_.get());
     resource_collection_ = new DelegatedFrameResourceCollection;
     resource_collection_->SetClient(this);
   }
 
   void DestroyResourceCollection() {
     if (resource_collection_.get()) {
       resource_collection_->SetClient(nullptr);
@@ skipping 120 matching lines @@
                                              return_callback,
                                              returned_resources,
                                              null_event,
                                              main_thread_task_runner.get()));
 
   thread.Stop();
 }
 
 }  // namespace
 }  // namespace cc