Update from https://crrev.com/309717

cc/resources/resource_update_controller_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/resources/resource_update_controller.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
@@ skipping 48 matching lines @@
         query_results_available_(0),
         full_upload_count_expected_(0),
         partial_count_expected_(0),
         total_upload_count_expected_(0),
         max_upload_count_per_update_(0),
         num_consecutive_flushes_(0),
         num_dangling_uploads_(0),
         num_total_uploads_(0),
         num_total_flushes_(0) {}
 
-  virtual ~ResourceUpdateControllerTest() {
+  ~ResourceUpdateControllerTest() override {
     DebugScopedSetImplThreadAndMainThreadBlocked
     impl_thread_and_main_thread_blocked(&proxy_);
     resource_manager_->ClearAllMemory(resource_provider_.get());
   }
 
  public:
   void OnFlush() {
     // Check for back-to-back flushes.
     EXPECT_EQ(0, num_consecutive_flushes_) << "Back-to-back flushes detected.";
 
@@ skipping 19 matching lines @@
 
   bool IsQueryResultAvailable() {
     if (!query_results_available_)
       return false;
 
     query_results_available_--;
     return true;
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     bitmap_.allocN32Pixels(300, 150);
 
     for (int i = 0; i < 4; i++) {
       textures_[i] = PrioritizedResource::Create(resource_manager_.get(),
                                                  gfx::Size(300, 150),
                                                  RGBA_8888);
       textures_[i]->
           set_request_priority(PriorityCalculator::VisiblePriority(true));
     }
     resource_manager_->PrioritizeTextures();
@@ skipping 387 matching lines @@
       RunPendingTask(task_runner.get(), controller.get());
   }
 
   EXPECT_FALSE(task_runner->HasPendingTask());
   EXPECT_TRUE(client.ReadyToFinalizeCalled());
   EXPECT_EQ(2, num_total_uploads_);
 }
 
 }  // namespace
 }  // namespace cc