Index: cc/resources/task_graph_runner_unittest.cc |
diff --git a/cc/resources/task_graph_runner_unittest.cc b/cc/resources/task_graph_runner_unittest.cc |
index 1a6256c5835ac614e7e0949040474b086fb8443d..6e5a785998614e0cbb20d9a9396f0810a8873dbc 100644 |
--- a/cc/resources/task_graph_runner_unittest.cc |
+++ b/cc/resources/task_graph_runner_unittest.cc |
@@ -118,7 +118,7 @@ class TaskGraphRunnerTestBase { |
: test_(test), namespace_index_(namespace_index), id_(id) {} |
// Overridden from Task: |
- virtual void RunOnWorkerThread() OVERRIDE { |
+ virtual void RunOnWorkerThread() override { |
test_->RunTaskOnWorkerThread(namespace_index_, id_); |
} |
@@ -145,7 +145,7 @@ class TaskGraphRunnerTestBase { |
: FakeTaskImpl(test, namespace_index, id) {} |
// Overridden from FakeTaskImpl: |
- virtual void CompleteOnOriginThread() OVERRIDE {} |
+ virtual void CompleteOnOriginThread() override {} |
private: |
virtual ~FakeDependentTaskImpl() {} |
@@ -167,7 +167,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, |
public base::DelegateSimpleThread::Delegate { |
public: |
// Overridden from testing::Test: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
const size_t num_threads = GetParam(); |
while (workers_.size() < num_threads) { |
scoped_ptr<base::DelegateSimpleThread> worker = |
@@ -179,7 +179,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, |
for (int i = 0; i < kNamespaceCount; ++i) |
namespace_token_[i] = task_graph_runner_->GetNamespaceToken(); |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
task_graph_runner_->Shutdown(); |
while (workers_.size()) { |
scoped_ptr<base::DelegateSimpleThread> worker = workers_.take_front(); |
@@ -189,7 +189,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, |
private: |
// Overridden from base::DelegateSimpleThread::Delegate: |
- virtual void Run() OVERRIDE { task_graph_runner_->Run(); } |
+ virtual void Run() override { task_graph_runner_->Run(); } |
ScopedPtrDeque<base::DelegateSimpleThread> workers_; |
}; |
@@ -285,21 +285,21 @@ class TaskGraphRunnerSingleThreadTest |
public base::DelegateSimpleThread::Delegate { |
public: |
// Overridden from testing::Test: |
- virtual void SetUp() OVERRIDE { |
+ virtual 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 { |
+ virtual void TearDown() override { |
task_graph_runner_->Shutdown(); |
worker_->Join(); |
} |
private: |
// Overridden from base::DelegateSimpleThread::Delegate: |
- virtual void Run() OVERRIDE { task_graph_runner_->Run(); } |
+ virtual void Run() override { task_graph_runner_->Run(); } |
scoped_ptr<base::DelegateSimpleThread> worker_; |
}; |