Update from https://crrev.com/304418

cc/resources/task_graph_runner_unittest.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/resources/task_graph_runner.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/synchronization/lock.h"
@@ skipping 149 matching lines @@
   std::vector<unsigned> run_task_ids_[kNamespaceCount];
   base::Lock run_task_ids_lock_;
   std::vector<unsigned> on_task_completed_ids_[kNamespaceCount];
 };
 
 class TaskGraphRunnerTest : public TaskGraphRunnerTestBase,
                             public testing::TestWithParam<int>,
                             public base::DelegateSimpleThread::Delegate {
  public:
   // Overridden from testing::Test:
-  virtual void SetUp() override {
+  void SetUp() override {
     const size_t num_threads = GetParam();
     while (workers_.size() < num_threads) {
       scoped_ptr<base::DelegateSimpleThread> worker =
           make_scoped_ptr(new base::DelegateSimpleThread(this, "TestWorker"));
       worker->Start();
       workers_.push_back(worker.Pass());
     }
 
     for (int i = 0; i < kNamespaceCount; ++i)
       namespace_token_[i] = task_graph_runner_->GetNamespaceToken();
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     task_graph_runner_->Shutdown();
     while (workers_.size()) {
       scoped_ptr<base::DelegateSimpleThread> worker = workers_.take_front();
       worker->Join();
     }
   }
 
  private:
   // Overridden from base::DelegateSimpleThread::Delegate:
   void Run() override { task_graph_runner_->Run(); }
@@ skipping 85 matching lines @@
 INSTANTIATE_TEST_CASE_P(TaskGraphRunnerTests,
                         TaskGraphRunnerTest,
                         ::testing::Range(1, 5));
 
 class TaskGraphRunnerSingleThreadTest
     : public TaskGraphRunnerTestBase,
       public testing::Test,
       public base::DelegateSimpleThread::Delegate {
  public:
   // Overridden from testing::Test:
-  virtual void SetUp() override {
+  void SetUp() override {
     worker_.reset(new base::DelegateSimpleThread(this, "TestWorker"));
     worker_->Start();
 
     for (int i = 0; i < kNamespaceCount; ++i)
       namespace_token_[i] = task_graph_runner_->GetNamespaceToken();
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     task_graph_runner_->Shutdown();
     worker_->Join();
   }
 
  private:
   // Overridden from base::DelegateSimpleThread::Delegate:
   void Run() override { task_graph_runner_->Run(); }
 
   scoped_ptr<base::DelegateSimpleThread> worker_;
 };
@@ skipping 16 matching lines @@
     EXPECT_EQ(0u, run_task_ids(i)[2]);
     EXPECT_EQ(2u, run_task_ids(i)[3]);
     ASSERT_EQ(2u, on_task_completed_ids(i).size());
     EXPECT_EQ(1u, on_task_completed_ids(i)[0]);
     EXPECT_EQ(0u, on_task_completed_ids(i)[1]);
   }
 }
 
 }  // namespace
 }  // namespace cc