| Index: base/threading/thread_unittest.cc
|
| diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc
|
| index 2bac84a697cd8c4ab4adc29f66c2be74cdbc97d7..f3fb3343e9a360c70108cfa7cce11e57f773a9ae 100644
|
| --- a/base/threading/thread_unittest.cc
|
| +++ b/base/threading/thread_unittest.cc
|
| @@ -31,11 +31,9 @@ class SleepInsideInitThread : public Thread {
|
| ANNOTATE_BENIGN_RACE(
|
| this, "Benign test-only data race on vptr - http://crbug.com/98219");
|
| }
|
| - virtual ~SleepInsideInitThread() {
|
| - Stop();
|
| - }
|
| + ~SleepInsideInitThread() override { Stop(); }
|
|
|
| - virtual void Init() override {
|
| + void Init() override {
|
| base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(500));
|
| init_called_ = true;
|
| }
|
| @@ -70,17 +68,11 @@ class CaptureToEventList : public Thread {
|
| event_list_(event_list) {
|
| }
|
|
|
| - virtual ~CaptureToEventList() {
|
| - Stop();
|
| - }
|
| + ~CaptureToEventList() override { Stop(); }
|
|
|
| - virtual void Init() override {
|
| - event_list_->push_back(THREAD_EVENT_INIT);
|
| - }
|
| + void Init() override { event_list_->push_back(THREAD_EVENT_INIT); }
|
|
|
| - virtual void CleanUp() override {
|
| - event_list_->push_back(THREAD_EVENT_CLEANUP);
|
| - }
|
| + void CleanUp() override { event_list_->push_back(THREAD_EVENT_CLEANUP); }
|
|
|
| private:
|
| EventList* event_list_;
|
| @@ -97,7 +89,7 @@ class CapturingDestructionObserver
|
| }
|
|
|
| // DestructionObserver implementation:
|
| - virtual void WillDestroyCurrentMessageLoop() override {
|
| + void WillDestroyCurrentMessageLoop() override {
|
| event_list_->push_back(THREAD_EVENT_MESSAGE_LOOP_DESTROYED);
|
| event_list_ = NULL;
|
| }
|
|
|