Revert of Standardize usage of virtual/override/final in ipc/

ipc/mojo/ipc_channel_mojo_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ipc/mojo/ipc_channel_mojo.h"
 
 #include "base/base_paths.h"
 #include "base/files/file.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_test_base.h"
 #include "ipc/ipc_test_channel_listener.h"
 #include "ipc/mojo/ipc_channel_mojo_host.h"
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 namespace {
 
 class ListenerThatExpectsOK : public IPC::Listener {
  public:
   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));
     EXPECT_EQ(should_be_ok, "OK");
     received_ok_ = true;
     base::MessageLoop::current()->Quit();
     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.
     DCHECK(received_ok_);
   }
 
   static void SendOK(IPC::Sender* sender) {
     IPC::Message* message = new IPC::Message(
         0, 2, IPC::Message::PRIORITY_NORMAL);
     message->WriteString(std::string("OK"));
@@ skipping 19 matching lines @@
 
   IPC::ChannelMojo* channel() const { return channel_.get(); }
 
  private:
   base::MessageLoopForIO main_message_loop_;
   scoped_ptr<IPC::ChannelMojo> channel_;
 };
 
 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()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
-  bool DidStartClient() override {
+  virtual bool DidStartClient() override {
     bool ok = IPCTestBase::DidStartClient();
     DCHECK(ok);
     host_->OnClientLaunched(client_process());
     return ok;
   }
 
  private:
   scoped_ptr<IPC::ChannelMojoHost> host_;
 };
 
 
 class TestChannelListenerWithExtraExpectations
     : public IPC::TestChannelListener {
  public:
   TestChannelListenerWithExtraExpectations()
       : 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;
   }
 
   bool is_connected_called() const { return is_connected_called_; }
 
  private:
   bool is_connected_called_;
 };
@@ skipping 38 matching lines @@
 
   return 0;
 }
 
 class ListenerExpectingErrors : public IPC::Listener {
  public:
   ListenerExpectingErrors()
       : 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();
   }
 
   bool has_error() const { return has_error_; }
 
  private:
   bool has_error_;
 };
 
 
 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()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
-  bool DidStartClient() override {
+  virtual bool DidStartClient() override {
     bool ok = IPCTestBase::DidStartClient();
     DCHECK(ok);
     host_->OnClientLaunched(client_process());
     return ok;
   }
 
  private:
   scoped_ptr<IPC::ChannelMojoHost> host_;
 };
 
 class ListenerThatQuits : public IPC::Listener {
  public:
   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();
   }
 };
 
 // A long running process that connects to us.
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(IPCChannelMojoErraticTestClient) {
   ListenerThatQuits listener;
   ChannelClient client(&listener, "IPCChannelMojoErraticTestClient");
   client.Connect();
 
@@ skipping 88 matching lines @@
   return 0;
 }
 #endif
 
 #if defined(OS_POSIX)
 class ListenerThatExpectsFile : public IPC::Listener {
  public:
   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;
     EXPECT_TRUE(message.ReadFile(&iter, &fd));
     base::File file(fd.release());
     std::string content(GetSendingFileContent().size(), ' ');
     file.Read(0, &content[0], content.size());
     EXPECT_EQ(content, GetSendingFileContent());
     base::MessageLoop::current()->Quit();
     ListenerThatExpectsOK::SendOK(sender_);
     return true;
   }
 
-  void OnChannelError() override { NOTREACHED(); }
+  virtual void OnChannelError() override {
+    NOTREACHED();
+  }
 
   static std::string GetSendingFileContent() {
     return "Hello";
   }
 
   static base::FilePath GetSendingFilePath() {
     base::FilePath path;
     bool ok = PathService::Get(base::DIR_CACHE, &path);
     EXPECT_TRUE(ok);
     return path.Append("ListenerThatExpectsFile.txt");
@@ skipping 43 matching lines @@
   client.Connect();
   listener.set_sender(client.channel());
 
   base::MessageLoop::current()->Run();
 
   return 0;
 }
 #endif
 
 }  // namespace