Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ipc/ipc_sync_channel_unittest.cc

Issue 669953003: Revert of Standardize usage of virtual/override/final in ipc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_sync_channel.h ('k') | ipc/ipc_sync_message.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_sync_channel_unittest.cc
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index 9ad0e58c3be12793ebc9e3bd5aa62c9ee866bbf0..3560d5ba0f5817d29ce600cf8e2255ed7a1e64ae 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -58,13 +58,13 @@
is_shutdown_(false) {
}
- ~Worker() override {
+ virtual ~Worker() {
// Shutdown() must be called before destruction.
CHECK(is_shutdown_);
}
void AddRef() { }
void Release() { }
- bool Send(Message* msg) override { return channel_->Send(msg); }
+ virtual bool Send(Message* msg) override { return channel_->Send(msg); }
void WaitForChannelCreation() { channel_created_->Wait(); }
void CloseChannel() {
DCHECK(base::MessageLoop::current() == ListenerThread()->message_loop());
@@ -200,7 +200,7 @@
listener_event->Signal();
}
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(Worker, message)
IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_Double, OnDoubleDelay)
IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_AnswerToLife,
@@ -274,7 +274,7 @@
explicit SimpleServer(bool pump_during_send)
: Worker(Channel::MODE_SERVER, "simpler_server"),
pump_during_send_(pump_during_send) { }
- void Run() override {
+ virtual void Run() override {
SendAnswerToLife(pump_during_send_, true);
Done();
}
@@ -286,7 +286,7 @@
public:
SimpleClient() : Worker(Channel::MODE_CLIENT, "simple_client") { }
- void OnAnswer(int* answer) override {
+ virtual void OnAnswer(int* answer) override {
*answer = 42;
Done();
}
@@ -316,12 +316,12 @@
: Worker(Channel::MODE_SERVER, "simpler_server"),
create_pipe_now_(create_pipe_now) { }
- void Run() override {
+ virtual void Run() override {
SendAnswerToLife(false, true);
Done();
}
- SyncChannel* CreateChannel() override {
+ virtual SyncChannel* CreateChannel() override {
SyncChannel* channel =
SyncChannel::Create(channel_name(), mode(), this,
ipc_thread().message_loop_proxy().get(),
@@ -339,12 +339,12 @@
: Worker(Channel::MODE_CLIENT, "simple_client"),
create_pipe_now_(create_pipe_now) { }
- void OnAnswer(int* answer) override {
+ virtual void OnAnswer(int* answer) override {
*answer = 42;
Done();
}
- SyncChannel* CreateChannel() override {
+ virtual SyncChannel* CreateChannel() override {
SyncChannel* channel =
SyncChannel::Create(channel_name(), mode(), this,
ipc_thread().message_loop_proxy().get(),
@@ -378,7 +378,7 @@
public:
DelayClient() : Worker(Channel::MODE_CLIENT, "delay_client") { }
- void OnAnswerDelay(Message* reply_msg) override {
+ virtual void OnAnswerDelay(Message* reply_msg) override {
SyncChannelTestMsg_AnswerToLife::WriteReplyParams(reply_msg, 42);
Send(reply_msg);
Done();
@@ -406,7 +406,7 @@
: Worker(Channel::MODE_SERVER, "no_hang_server"),
got_first_reply_(got_first_reply),
pump_during_send_(pump_during_send) { }
- void Run() override {
+ virtual void Run() override {
SendAnswerToLife(pump_during_send_, true);
got_first_reply_->Signal();
@@ -424,7 +424,7 @@
: Worker(Channel::MODE_CLIENT, "no_hang_client"),
got_first_reply_(got_first_reply) { }
- void OnAnswerDelay(Message* reply_msg) override {
+ virtual void OnAnswerDelay(Message* reply_msg) override {
// Use the DELAY_REPLY macro so that we can force the reply to be sent
// before this function returns (when the channel will be reset).
SyncChannelTestMsg_AnswerToLife::WriteReplyParams(reply_msg, 42);
@@ -459,7 +459,7 @@
: Worker(Channel::MODE_SERVER, "unblock_server"),
pump_during_send_(pump_during_send),
delete_during_send_(delete_during_send) { }
- void Run() override {
+ virtual void Run() override {
if (delete_during_send_) {
// Use custom code since race conditions mean the answer may or may not be
// available.
@@ -474,7 +474,7 @@
Done();
}
- void OnDoubleDelay(int in, Message* reply_msg) override {
+ virtual void OnDoubleDelay(int in, Message* reply_msg) override {
SyncChannelTestMsg_Double::WriteReplyParams(reply_msg, in * 2);
Send(reply_msg);
if (delete_during_send_)
@@ -491,7 +491,7 @@
: Worker(Channel::MODE_CLIENT, "unblock_client"),
pump_during_send_(pump_during_send) { }
- void OnAnswer(int* answer) override {
+ virtual void OnAnswer(int* answer) override {
SendDouble(pump_during_send_, true);
*answer = 42;
Done();
@@ -533,12 +533,12 @@
: Worker(Channel::MODE_SERVER, "recursive_server"),
expected_send_result_(expected_send_result),
pump_first_(pump_first), pump_second_(pump_second) {}
- void Run() override {
+ virtual void Run() override {
SendDouble(pump_first_, expected_send_result_);
Done();
}
- void OnDouble(int in, int* out) override {
+ virtual void OnDouble(int in, int* out) override {
*out = in * 2;
SendAnswerToLife(pump_second_, expected_send_result_);
}
@@ -552,7 +552,7 @@
: Worker(Channel::MODE_CLIENT, "recursive_client"),
pump_during_send_(pump_during_send), close_channel_(close_channel) {}
- void OnDoubleDelay(int in, Message* reply_msg) override {
+ virtual void OnDoubleDelay(int in, Message* reply_msg) override {
SendDouble(pump_during_send_, !close_channel_);
if (close_channel_) {
delete reply_msg;
@@ -563,7 +563,7 @@
Done();
}
- void OnAnswerDelay(Message* reply_msg) override {
+ virtual void OnAnswerDelay(Message* reply_msg) override {
if (close_channel_) {
delete reply_msg;
CloseChannel();
@@ -629,7 +629,7 @@
: Worker("test_channel1", Channel::MODE_SERVER),
pump_during_send_(pump_during_send) { }
- void Run() override {
+ virtual void Run() override {
SendDouble(pump_during_send_, true);
Done();
}
@@ -645,7 +645,7 @@
client1_msg_received_(client1_msg_received),
client1_can_reply_(client1_can_reply) { }
- void OnDouble(int in, int* out) override {
+ virtual void OnDouble(int in, int* out) override {
client1_msg_received_->Signal();
*out = in * 2;
client1_can_reply_->Wait();
@@ -660,7 +660,7 @@
public:
MultipleServer2() : Worker("test_channel2", Channel::MODE_SERVER) { }
- void OnAnswer(int* result) override {
+ virtual void OnAnswer(int* result) override {
*result = 42;
Done();
}
@@ -676,7 +676,7 @@
client1_can_reply_(client1_can_reply),
pump_during_send_(pump_during_send) { }
- void Run() override {
+ virtual void Run() override {
client1_msg_received_->Wait();
SendAnswerToLife(pump_during_send_, true);
client1_can_reply_->Signal();
@@ -746,7 +746,7 @@
Worker::OverrideThread(listener_thread);
}
- void OnNestedTestMsg(Message* reply_msg) override {
+ virtual void OnNestedTestMsg(Message* reply_msg) override {
VLOG(1) << __FUNCTION__ << " Sending reply: " << reply_text_;
SyncChannelNestedTestMsg_String::WriteReplyParams(reply_msg, reply_text_);
Send(reply_msg);
@@ -775,7 +775,7 @@
Worker::OverrideThread(listener_thread);
}
- void Run() override {
+ virtual void Run() override {
std::string response;
SyncMessage* msg = new SyncChannelNestedTestMsg_String(&response);
if (pump_during_send_)
@@ -848,7 +848,7 @@
ChattyClient() :
Worker(Channel::MODE_CLIENT, "chatty_client") { }
- void OnAnswer(int* answer) override {
+ virtual void OnAnswer(int* answer) override {
// The PostMessage limit is 10k. Send 20% more than that.
const int kMessageLimit = 10000;
const int kMessagesToSend = kMessageLimit * 120 / 100;
@@ -895,7 +895,7 @@
DoneEventRaceServer()
: Worker(Channel::MODE_SERVER, "done_event_race_server") { }
- void Run() override {
+ virtual void Run() override {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(&NestedCallback, this));
base::MessageLoop::current()->PostDelayedTask(
@@ -934,7 +934,7 @@
message_loop_(message_loop) {
}
- void OnFilterAdded(Sender* sender) override {
+ virtual void OnFilterAdded(Sender* sender) override {
SyncMessageFilter::OnFilterAdded(sender);
message_loop_->PostTask(
FROM_HERE,
@@ -951,7 +951,7 @@
}
private:
- ~TestSyncMessageFilter() override {}
+ virtual ~TestSyncMessageFilter() {}
Worker* worker_;
scoped_refptr<base::MessageLoopProxy> message_loop_;
@@ -969,7 +969,9 @@
thread_.message_loop_proxy());
}
- void Run() override { channel()->AddFilter(filter_.get()); }
+ virtual void Run() override {
+ channel()->AddFilter(filter_.get());
+ }
base::Thread thread_;
scoped_refptr<TestSyncMessageFilter> filter_;
@@ -996,12 +998,12 @@
}
private:
- void Run() override {
+ virtual void Run() override {
CloseChannel();
Done();
}
- bool Send(Message* msg) override {
+ virtual bool Send(Message* msg) override {
send_result_ = Worker::Send(msg);
Done();
return send_result_;
@@ -1063,7 +1065,7 @@
base::Thread* ListenerThread() { return Worker::ListenerThread(); }
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchServer, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_PingTTL, OnPingTTL)
@@ -1096,7 +1098,7 @@
}
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(NonRestrictedDispatchServer, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, Done)
@@ -1121,7 +1123,7 @@
success_(success),
sent_ping_event_(sent_ping_event) {}
- void Run() override {
+ virtual void Run() override {
// Incoming messages from our channel should only be dispatched when we
// send a message on that same channel.
channel()->SetRestrictDispatchChannelGroup(1);
@@ -1185,7 +1187,7 @@
}
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchClient, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Ping, OnPing)
IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_PingTTL, OnPingTTL)
@@ -1279,7 +1281,7 @@
SendMessageToClient();
}
- void Run() override {
+ virtual void Run() override {
channel()->SetRestrictDispatchChannelGroup(1);
server_ready_event_->Signal();
}
@@ -1287,7 +1289,7 @@
base::Thread* ListenerThread() { return Worker::ListenerThread(); }
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockServer, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, Done)
@@ -1327,7 +1329,9 @@
received_noarg_reply_(false),
done_issued_(false) {}
- void Run() override { server_ready_event_->Wait(); }
+ virtual void Run() override {
+ server_ready_event_->Wait();
+ }
void OnDoClient2Task() {
events_[3]->Wait();
@@ -1343,7 +1347,7 @@
base::Thread* ListenerThread() { return Worker::ListenerThread(); }
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockClient2, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
IPC_END_MESSAGE_MAP()
@@ -1386,7 +1390,7 @@
received_noarg_reply_(false),
done_issued_(false) {}
- void Run() override {
+ virtual void Run() override {
server_ready_event_->Wait();
server_->ListenerThread()->message_loop()->PostTask(
FROM_HERE,
@@ -1406,7 +1410,7 @@
}
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockClient1, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
IPC_END_MESSAGE_MAP()
@@ -1519,7 +1523,7 @@
Done();
}
- void Run() override {
+ virtual void Run() override {
channel()->SetRestrictDispatchChannelGroup(group_);
if (is_first())
event1_->Signal();
@@ -1552,7 +1556,7 @@
bool is_first() { return !!success_; }
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchPipeWorker, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_PingTTL, OnPingTTL)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, OnDone)
@@ -1603,7 +1607,7 @@
: Worker("reentrant_reply1", Channel::MODE_SERVER),
server_ready_(server_ready) { }
- void Run() override {
+ virtual void Run() override {
server2_channel_ =
SyncChannel::Create("reentrant_reply2",
IPC::Channel::MODE_CLIENT,
@@ -1619,7 +1623,7 @@
}
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(ReentrantReplyServer1, message)
IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Reentrant2, OnReentrant2)
IPC_REPLY_HANDLER(OnReply)
@@ -1649,7 +1653,7 @@
reply_(NULL) { }
private:
- bool OnMessageReceived(const Message& message) override {
+ virtual bool OnMessageReceived(const Message& message) override {
IPC_BEGIN_MESSAGE_MAP(ReentrantReplyServer2, message)
IPC_MESSAGE_HANDLER_DELAY_REPLY(
SyncChannelTestMsg_Reentrant1, OnReentrant1)
@@ -1681,7 +1685,7 @@
: Worker("reentrant_reply1", Channel::MODE_CLIENT),
server_ready_(server_ready) { }
- void Run() override {
+ virtual void Run() override {
server_ready_->Wait();
Send(new SyncChannelTestMsg_Reentrant2());
Done();
@@ -1714,7 +1718,7 @@
Worker::OverrideThread(listener_thread);
}
- void OnNestedTestMsg(Message* reply_msg) override {
+ virtual void OnNestedTestMsg(Message* reply_msg) override {
VLOG(1) << __FUNCTION__ << " Sending reply: " << reply_text_;
SyncChannelNestedTestMsg_String::WriteReplyParams(reply_msg, reply_text_);
Send(reply_msg);
@@ -1736,7 +1740,7 @@
Worker::OverrideThread(listener_thread);
}
- void Run() override {
+ virtual void Run() override {
std::string response;
SyncMessage* msg = new SyncChannelNestedTestMsg_String(&response);
bool result = Send(msg);
« no previous file with comments | « ipc/ipc_sync_channel.h ('k') | ipc/ipc_sync_message.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698