| Index: base/message_loop/message_pump_io_ios_unittest.cc
|
| diff --git a/base/message_loop/message_pump_io_ios_unittest.cc b/base/message_loop/message_pump_io_ios_unittest.cc
|
| index e6dcc33a4bff2a1f378b19a34016ccf12fba2849..ccd808b715493a3ff60dce8be9344bc0976c8788 100644
|
| --- a/base/message_loop/message_pump_io_ios_unittest.cc
|
| +++ b/base/message_loop/message_pump_io_ios_unittest.cc
|
| @@ -20,7 +20,7 @@ class MessagePumpIOSForIOTest : public testing::Test {
|
| io_thread_("MessagePumpIOSForIOTestIOThread") {}
|
| virtual ~MessagePumpIOSForIOTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + void SetUp() override {
|
| Thread::Options options(MessageLoop::TYPE_IO, 0);
|
| ASSERT_TRUE(io_thread_.StartWithOptions(options));
|
| ASSERT_EQ(MessageLoop::TYPE_IO, io_thread_.message_loop()->type());
|
| @@ -30,7 +30,7 @@ class MessagePumpIOSForIOTest : public testing::Test {
|
| ASSERT_EQ(0, ret);
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + void TearDown() override {
|
| if (IGNORE_EINTR(close(pipefds_[0])) < 0)
|
| PLOG(ERROR) << "close";
|
| if (IGNORE_EINTR(close(pipefds_[1])) < 0)
|
| @@ -67,8 +67,8 @@ class StupidWatcher : public MessagePumpIOSForIO::Watcher {
|
| virtual ~StupidWatcher() {}
|
|
|
| // base:MessagePumpIOSForIO::Watcher interface
|
| - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE {}
|
| - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {}
|
| + void OnFileCanReadWithoutBlocking(int fd) override {}
|
| + void OnFileCanWriteWithoutBlocking(int fd) override {}
|
| };
|
|
|
| #if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
|
| @@ -96,13 +96,9 @@ class BaseWatcher : public MessagePumpIOSForIO::Watcher {
|
| virtual ~BaseWatcher() {}
|
|
|
| // MessagePumpIOSForIO::Watcher interface
|
| - virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {
|
| - NOTREACHED();
|
| - }
|
| + void OnFileCanReadWithoutBlocking(int /* fd */) override { NOTREACHED(); }
|
|
|
| - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {
|
| - NOTREACHED();
|
| - }
|
| + void OnFileCanWriteWithoutBlocking(int /* fd */) override { NOTREACHED(); }
|
|
|
| protected:
|
| MessagePumpIOSForIO::FileDescriptorWatcher* controller_;
|
| @@ -118,7 +114,7 @@ class DeleteWatcher : public BaseWatcher {
|
| DCHECK(!controller_);
|
| }
|
|
|
| - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {
|
| + void OnFileCanWriteWithoutBlocking(int /* fd */) override {
|
| DCHECK(controller_);
|
| delete controller_;
|
| controller_ = NULL;
|
| @@ -148,7 +144,7 @@ class StopWatcher : public BaseWatcher {
|
|
|
| virtual ~StopWatcher() {}
|
|
|
| - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {
|
| + void OnFileCanWriteWithoutBlocking(int /* fd */) override {
|
| controller_->StopWatchingFileDescriptor();
|
| if (fd_to_start_watching_ >= 0) {
|
| pump_->WatchFileDescriptor(fd_to_start_watching_,
|
|
|