Revert of Standardize usage of virtual/override/final in ipc/ (patchset #1 id:1 of https://codereview.chromium.org/645623006/)
Reason for revert:
Addressing reviewer comments in a followup patch.
Original issue's description:
> Standardize usage of virtual/override/final in ipc/
>
> This patch was automatically generated by applying clang fixit hints
> generated by the plugin to the source tree.
>
> BUG=417463
> TBR=agl@chromium.org
>
> Committed: https://crrev.com/39be52ebbd6681c7d79ad63e2a0ab028075af0c2
> Cr-Commit-Position: refs/heads/master@{#300481}
TBR=agl@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=417463
Review URL: https://codereview.chromium.org/669953003
Cr-Commit-Position: refs/heads/master@{#300521}
CrOS-Libchrome-Original-Commit: f3076af7e0dfc078e65039a0e6faebf9a7628a63
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index 1697ff7..cefa29e 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -27,9 +27,9 @@
ListenerThatExpectsOK()
: received_ok_(false) {}
- ~ListenerThatExpectsOK() override {}
+ virtual ~ListenerThatExpectsOK() {}
- bool OnMessageReceived(const IPC::Message& message) override {
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
PickleIterator iter(message);
std::string should_be_ok;
EXPECT_TRUE(iter.ReadString(&should_be_ok));
@@ -39,7 +39,7 @@
return true;
}
- void OnChannelError() override {
+ virtual void OnChannelError() override {
// The connection should be healthy while the listener is waiting
// message. An error can occur after that because the peer
// process dies.
@@ -79,7 +79,7 @@
class IPCChannelMojoTest : public IPCTestBase {
protected:
- scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
+ virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
const IPC::ChannelHandle& handle,
base::TaskRunner* runner) override {
host_.reset(new IPC::ChannelMojoHost(task_runner()));
@@ -87,7 +87,7 @@
handle);
}
- bool DidStartClient() override {
+ virtual bool DidStartClient() override {
bool ok = IPCTestBase::DidStartClient();
DCHECK(ok);
host_->OnClientLaunched(client_process());
@@ -106,7 +106,7 @@
: is_connected_called_(false) {
}
- void OnChannelConnected(int32 peer_pid) override {
+ virtual void OnChannelConnected(int32 peer_pid) override {
IPC::TestChannelListener::OnChannelConnected(peer_pid);
EXPECT_TRUE(base::kNullProcessId != peer_pid);
is_connected_called_ = true;
@@ -165,13 +165,15 @@
: has_error_(false) {
}
- void OnChannelConnected(int32 peer_pid) override {
+ virtual void OnChannelConnected(int32 peer_pid) override {
base::MessageLoop::current()->Quit();
}
- bool OnMessageReceived(const IPC::Message& message) override { return true; }
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
+ return true;
+ }
- void OnChannelError() override {
+ virtual void OnChannelError() override {
has_error_ = true;
base::MessageLoop::current()->Quit();
}
@@ -185,7 +187,7 @@
class IPCChannelMojoErrorTest : public IPCTestBase {
protected:
- scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
+ virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
const IPC::ChannelHandle& handle,
base::TaskRunner* runner) override {
host_.reset(new IPC::ChannelMojoHost(task_runner()));
@@ -193,7 +195,7 @@
handle);
}
- bool DidStartClient() override {
+ virtual bool DidStartClient() override {
bool ok = IPCTestBase::DidStartClient();
DCHECK(ok);
host_->OnClientLaunched(client_process());
@@ -209,9 +211,11 @@
ListenerThatQuits() {
}
- bool OnMessageReceived(const IPC::Message& message) override { return true; }
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
+ return true;
+ }
- void OnChannelConnected(int32 peer_pid) override {
+ virtual void OnChannelConnected(int32 peer_pid) override {
base::MessageLoop::current()->Quit();
}
};
@@ -320,9 +324,9 @@
ListenerThatExpectsFile()
: sender_(NULL) {}
- ~ListenerThatExpectsFile() override {}
+ virtual ~ListenerThatExpectsFile() {}
- bool OnMessageReceived(const IPC::Message& message) override {
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
PickleIterator iter(message);
base::ScopedFD fd;
@@ -336,7 +340,9 @@
return true;
}
- void OnChannelError() override { NOTREACHED(); }
+ virtual void OnChannelError() override {
+ NOTREACHED();
+ }
static std::string GetSendingFileContent() {
return "Hello";