diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/ipc_channel.h | 2 | ||||
-rw-r--r-- | ipc/ipc_channel_posix_unittest.cc | 4 | ||||
-rw-r--r-- | ipc/ipc_channel_proxy_unittest.cc | 6 | ||||
-rw-r--r-- | ipc/ipc_test_base.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 2fc52cb..3468194 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -178,7 +178,7 @@ class IPC_EXPORT Channel : public Sender { // // |message| must be allocated using operator new. This object will be // deleted once the contents of the Message have been sent. - virtual bool Send(Message* message) override = 0; + bool Send(Message* message) override = 0; // NaCl in Non-SFI mode runs on Linux directly, and the following functions // compiled on Linux are also needed. Please see also comments in diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index 786623b..a01710c 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -109,8 +109,8 @@ class IPCChannelPosixTest : public base::MultiProcessTest { static const std::string GetChannelDirName(); protected: - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; private: scoped_ptr<base::MessageLoopForIO> message_loop_; diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc index 848367e..6ed2470 100644 --- a/ipc/ipc_channel_proxy_unittest.cc +++ b/ipc/ipc_channel_proxy_unittest.cc @@ -232,9 +232,9 @@ class MessageCountFilter : public IPC::MessageFilter { class IPCChannelProxyTest : public IPCTestBase { public: IPCChannelProxyTest() {} - virtual ~IPCChannelProxyTest() {} + ~IPCChannelProxyTest() override {} - virtual void SetUp() override { + void SetUp() override { IPCTestBase::SetUp(); Init("ChannelProxyClient"); @@ -250,7 +250,7 @@ class IPCChannelProxyTest : public IPCTestBase { ASSERT_TRUE(StartClient()); } - virtual void TearDown() { + void TearDown() override { DestroyChannelProxy(); thread_.reset(); listener_.reset(); diff --git a/ipc/ipc_test_base.h b/ipc/ipc_test_base.h index 89d53db5..11f6455 100644 --- a/ipc/ipc_test_base.h +++ b/ipc/ipc_test_base.h @@ -32,9 +32,9 @@ class IPCTestBase : public base::MultiProcessTest { protected: IPCTestBase(); - virtual ~IPCTestBase(); + ~IPCTestBase() override; - virtual void TearDown() override; + void TearDown() override; // Initializes the test to use the given client and creates an IO message loop // on the current thread. |