Update from https://crrev.com/315085

tools/android/forwarder2/device_forwarder_main.cc

 // Copyright (c) 2012 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 <signal.h>
 #include <stdlib.h>
 
 #include <iostream>
 #include <string>
 
@@ skipping 30 matching lines @@
 // Lets the daemon fetch the exit notifier file descriptor.
 int GetExitNotifierFD() {
   DCHECK(g_notifier);
   return g_notifier->receiver_fd();
 }
 
 class ServerDelegate : public Daemon::ServerDelegate {
  public:
   ServerDelegate() : initialized_(false) {}
 
-  virtual ~ServerDelegate() {
+  ~ServerDelegate() override {
     if (!controller_thread_.get())
       return;
     // The DeviceController instance, if any, is constructed on the controller
     // thread. Make sure that it gets deleted on that same thread. Note that
     // DeleteSoon() is not used here since it would imply reading |controller_|
     // from the main thread while it's set on the internal thread.
     controller_thread_->message_loop_proxy()->PostTask(
         FROM_HERE,
         base::Bind(&ServerDelegate::DeleteControllerOnInternalThread,
                    base::Unretained(this)));
   }
 
   void DeleteControllerOnInternalThread() {
     DCHECK(
         controller_thread_->message_loop_proxy()->RunsTasksOnCurrentThread());
     controller_.reset();
   }
 
   // Daemon::ServerDelegate:
-  virtual void Init() override {
+  void Init() override {
     DCHECK(!g_notifier);
     g_notifier = new forwarder2::PipeNotifier();
     signal(SIGTERM, KillHandler);
     signal(SIGINT, KillHandler);
     controller_thread_.reset(new base::Thread("controller_thread"));
     controller_thread_->Start();
   }
 
-  virtual void OnClientConnected(scoped_ptr<Socket> client_socket) override {
+  void OnClientConnected(scoped_ptr<Socket> client_socket) override {
     if (initialized_) {
       client_socket->WriteString("OK");
       return;
     }
     controller_thread_->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&ServerDelegate::StartController, base::Unretained(this),
                    GetExitNotifierFD(), base::Passed(&client_socket)));
     initialized_ = true;
   }
@@ skipping 21 matching lines @@
   bool initialized_;
 };
 
 class ClientDelegate : public Daemon::ClientDelegate {
  public:
   ClientDelegate() : has_failed_(false) {}
 
   bool has_failed() const { return has_failed_; }
 
   // Daemon::ClientDelegate:
-  virtual void OnDaemonReady(Socket* daemon_socket) override {
+  void OnDaemonReady(Socket* daemon_socket) override {
     char buf[kBufSize];
     const int bytes_read = daemon_socket->Read(
         buf, sizeof(buf) - 1 /* leave space for null terminator */);
     CHECK_GT(bytes_read, 0);
     DCHECK(static_cast<unsigned int>(bytes_read) < sizeof(buf));
     buf[bytes_read] = 0;
     base::StringPiece msg(buf, bytes_read);
     if (msg.starts_with("ERROR")) {
       LOG(ERROR) << msg;
       has_failed_ = true;
@@ skipping 27 matching lines @@
     return 1;
   return client_delegate.has_failed();
 }
 
 }  // namespace
 }  // namespace forwarder2
 
 int main(int argc, char** argv) {
   return forwarder2::RunDeviceForwarder(argc, argv);
 }