Update from https://crrev.com/309717

cc/resources/resource_update_controller_unittest.cc

Index: cc/resources/resource_update_controller_unittest.cc
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index d6b4f39b40b94bbb1131abb6db0a1fd128a49877..1aa0902d469932c0ea6eb4c2598574c4c40ae666 100644
--- a/cc/resources/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_unittest.cc
@@ -66,7 +66,7 @@ class ResourceUpdateControllerTest : public Test {
         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());
@@ -106,7 +106,7 @@ class ResourceUpdateControllerTest : public Test {
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     bitmap_.allocN32Pixels(300, 150);
 
     for (int i = 0; i < 4; i++) {