Index: base/message_loop/message_pump_libevent_unittest.cc |
diff --git a/base/message_loop/message_pump_libevent_unittest.cc b/base/message_loop/message_pump_libevent_unittest.cc |
index 9298d687609cff87a05f43f1a1c55e728ef8fb5a..ab3ec41760ac4f0a0a694ec2b1e487cd1fe6492b 100644 |
--- a/base/message_loop/message_pump_libevent_unittest.cc |
+++ b/base/message_loop/message_pump_libevent_unittest.cc |
@@ -23,7 +23,7 @@ class MessagePumpLibeventTest : public testing::Test { |
io_thread_("MessagePumpLibeventTestIOThread") {} |
virtual ~MessagePumpLibeventTest() {} |
- 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()); |
@@ -31,7 +31,7 @@ class MessagePumpLibeventTest : 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) |
@@ -65,8 +65,8 @@ class StupidWatcher : public MessagePumpLibevent::Watcher { |
virtual ~StupidWatcher() {} |
// base:MessagePumpLibevent::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) |
@@ -100,13 +100,9 @@ class BaseWatcher : public MessagePumpLibevent::Watcher { |
virtual ~BaseWatcher() {} |
// base:MessagePumpLibevent::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: |
MessagePumpLibevent::FileDescriptorWatcher* controller_; |
@@ -122,7 +118,7 @@ class DeleteWatcher : public BaseWatcher { |
DCHECK(!controller_); |
} |
- virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE { |
+ void OnFileCanWriteWithoutBlocking(int /* fd */) override { |
DCHECK(controller_); |
delete controller_; |
controller_ = NULL; |
@@ -149,7 +145,7 @@ class StopWatcher : public BaseWatcher { |
virtual ~StopWatcher() {} |
- virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE { |
+ void OnFileCanWriteWithoutBlocking(int /* fd */) override { |
controller_->StopWatchingFileDescriptor(); |
} |
}; |
@@ -179,14 +175,14 @@ class NestedPumpWatcher : public MessagePumpLibevent::Watcher { |
NestedPumpWatcher() {} |
virtual ~NestedPumpWatcher() {} |
- virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE { |
+ void OnFileCanReadWithoutBlocking(int /* fd */) override { |
RunLoop runloop; |
MessageLoop::current()->PostTask(FROM_HERE, Bind(&QuitMessageLoopAndStart, |
runloop.QuitClosure())); |
runloop.Run(); |
} |
- virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {} |
+ void OnFileCanWriteWithoutBlocking(int /* fd */) override {} |
}; |
TEST_F(MessagePumpLibeventTest, NestedPumpWatcher) { |