diff options
author | mostynb <mostynb@opera.com> | 2014-10-07 00:17:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 07:17:32 +0000 |
commit | 50a41f330c528275c2980d59dbe9d99d8aec2b49 (patch) | |
tree | 9fc16ccb13091088d318fa57c4a5c28e5dd05945 /ipc/ipc_channel_proxy_unittest.cc | |
parent | c2ea7251fcf2113162201e24b4f65f8f36ef94d6 (diff) | |
download | chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.zip chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.tar.gz chromium_src-50a41f330c528275c2980d59dbe9d99d8aec2b49.tar.bz2 |
replace OVERRIDE and FINAL with override and final in ipc/
BUG=417463
Review URL: https://codereview.chromium.org/633563002
Cr-Commit-Position: refs/heads/master@{#298413}
Diffstat (limited to 'ipc/ipc_channel_proxy_unittest.cc')
-rw-r--r-- | ipc/ipc_channel_proxy_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc index 81b65ec..9042f44 100644 --- a/ipc/ipc_channel_proxy_unittest.cc +++ b/ipc/ipc_channel_proxy_unittest.cc @@ -49,7 +49,7 @@ class QuitListener : public IPC::Listener { QuitListener() : bad_message_received_(false) {} virtual ~QuitListener() {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { IPC_BEGIN_MESSAGE_MAP(QuitListener, message) IPC_MESSAGE_HANDLER(WorkerMsg_Quit, OnQuit) IPC_MESSAGE_HANDLER(TestMsg_BadMessage, OnBadMessage) @@ -57,7 +57,7 @@ class QuitListener : public IPC::Listener { return true; } - virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE { + virtual void OnBadMessageReceived(const IPC::Message& message) override { bad_message_received_ = true; } @@ -83,7 +83,7 @@ class ChannelReflectorListener : public IPC::Listener { channel_ = channel; } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { IPC_BEGIN_MESSAGE_MAP(ChannelReflectorListener, message) IPC_MESSAGE_HANDLER(TestMsg_Bounce, OnTestBounce) IPC_MESSAGE_HANDLER(TestMsg_SendBadMessage, OnSendBadMessage) @@ -143,24 +143,24 @@ class MessageCountFilter : public IPC::MessageFilter { last_filter_event_(NONE), message_filtering_enabled_(false) {} - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE { + virtual void OnFilterAdded(IPC::Sender* sender) override { EXPECT_TRUE(sender); EXPECT_EQ(NONE, last_filter_event_); last_filter_event_ = FILTER_ADDED; } - virtual void OnChannelConnected(int32_t peer_pid) OVERRIDE { + virtual void OnChannelConnected(int32_t peer_pid) override { EXPECT_EQ(FILTER_ADDED, last_filter_event_); EXPECT_NE(static_cast<int32_t>(base::kNullProcessId), peer_pid); last_filter_event_ = CHANNEL_CONNECTED; } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_); last_filter_event_ = CHANNEL_ERROR; } - virtual void OnChannelClosing() OVERRIDE { + virtual void OnChannelClosing() override { // We may or may not have gotten OnChannelError; if not, the last event has // to be OnChannelConnected. if (last_filter_event_ != CHANNEL_ERROR) @@ -168,7 +168,7 @@ class MessageCountFilter : public IPC::MessageFilter { last_filter_event_ = CHANNEL_CLOSING; } - virtual void OnFilterRemoved() OVERRIDE { + virtual void OnFilterRemoved() override { // If the channel didn't get a chance to connect, we might see the // OnFilterRemoved event with no other events preceding it. We still want // OnFilterRemoved to be called to allow for deleting the Filter. @@ -177,7 +177,7 @@ class MessageCountFilter : public IPC::MessageFilter { last_filter_event_ = FILTER_REMOVED; } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { // We should always get the OnFilterAdded and OnChannelConnected events // prior to any messages. EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_); @@ -204,7 +204,7 @@ class MessageCountFilter : public IPC::MessageFilter { } virtual bool GetSupportedMessageClasses( - std::vector<uint32>* supported_message_classes) const OVERRIDE { + std::vector<uint32>* supported_message_classes) const override { if (is_global_filter_) return false; supported_message_classes->push_back(supported_message_class_); @@ -234,7 +234,7 @@ class IPCChannelProxyTest : public IPCTestBase { IPCChannelProxyTest() {} virtual ~IPCChannelProxyTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { IPCTestBase::SetUp(); Init("ChannelProxyClient"); @@ -383,7 +383,7 @@ class IPCChannelBadMessageTest : public IPCTestBase { IPCChannelBadMessageTest() {} virtual ~IPCChannelBadMessageTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { IPCTestBase::SetUp(); Init("ChannelProxyClient"); |