Index: ipc/ipc_channel_proxy_unittest.cc |
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc |
index 848367ec782bd2e481d7b3deba85b8b916ae09a0..9042f44d3f7ee96a5e808d07106a9c562072b1fb 100644 |
--- a/ipc/ipc_channel_proxy_unittest.cc |
+++ b/ipc/ipc_channel_proxy_unittest.cc |
@@ -47,9 +47,9 @@ |
class QuitListener : public IPC::Listener { |
public: |
QuitListener() : bad_message_received_(false) {} |
- ~QuitListener() override {} |
- |
- bool OnMessageReceived(const IPC::Message& message) override { |
+ virtual ~QuitListener() {} |
+ |
+ 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 @@ |
return true; |
} |
- void OnBadMessageReceived(const IPC::Message& message) override { |
+ virtual void OnBadMessageReceived(const IPC::Message& message) override { |
bad_message_received_ = true; |
} |
@@ -76,14 +76,14 @@ |
class ChannelReflectorListener : public IPC::Listener { |
public: |
ChannelReflectorListener() : channel_(NULL) {} |
- ~ChannelReflectorListener() override {} |
+ virtual ~ChannelReflectorListener() {} |
void Init(IPC::Channel* channel) { |
DCHECK(!channel_); |
channel_ = channel; |
} |
- 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 @@ |
last_filter_event_(NONE), |
message_filtering_enabled_(false) {} |
- 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; |
} |
- 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; |
} |
- void OnChannelError() override { |
+ virtual void OnChannelError() override { |
EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_); |
last_filter_event_ = CHANNEL_ERROR; |
} |
- 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 @@ |
last_filter_event_ = CHANNEL_CLOSING; |
} |
- 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 @@ |
last_filter_event_ = FILTER_REMOVED; |
} |
- 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_); |
@@ -203,7 +203,7 @@ |
CHECK(false); |
} |
- bool GetSupportedMessageClasses( |
+ virtual bool GetSupportedMessageClasses( |
std::vector<uint32>* supported_message_classes) const override { |
if (is_global_filter_) |
return false; |
@@ -219,7 +219,7 @@ |
FilterEvent last_filter_event() const { return last_filter_event_; } |
private: |
- ~MessageCountFilter() override {} |
+ virtual ~MessageCountFilter() {} |
size_t messages_received_; |
uint32 supported_message_class_; |