Add device port unmapping support to forwarder2.

tools/android/forwarder2/daemon.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 "tools/android/forwarder2/daemon.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/file.h>
@@ skipping 38 matching lines @@
           logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS));
 }
 
 bool RunServerAcceptLoop(const std::string& welcome_message,
                          Socket* server_socket,
                          Daemon::ServerDelegate* server_delegate) {
   bool failed = false;
   for (;;) {
     scoped_ptr<Socket> client_socket(new Socket());
     if (!server_socket->Accept(client_socket.get())) {
-      if (server_socket->exited())
+      if (server_socket->DidReceiveEvent())
         break;
       PError("Accept()");
       failed = true;
       break;
     }
     if (!client_socket->Write(welcome_message.c_str(),
                               welcome_message.length() + 1)) {
       PError("Write()");
       failed = true;
       continue;
@@ skipping 130 matching lines @@
           scoped_ptr<Socket> client_socket = ConnectToUnixDomainSocket(
               identifier_, kSingleTry, kNoIdleTime, identifier_);
           if (client_socket.get()) {
             // The daemon was spawned by a concurrent process.
             exit(0);
           }
           PError("bind()");
           exit(1);
         }
         server_delegate_->Init();
-        command_socket.set_exit_notifier_fd(get_exit_fd_callback_());
+        command_socket.AddEventFd(get_exit_fd_callback_());
         exit(!RunServerAcceptLoop(identifier_, &command_socket,
                                   server_delegate_));
       }
       default:
         break;
     }
   }
   // Parent.
   // Install the custom SIGCHLD handler.
   sigset_t blocked_signals_set;
@@ skipping 57 matching lines @@
       return true;
     }
     usleep(kIdleTimeMSec * 1000);
   }
   LOG(ERROR) << "Timed out while killing daemon. "
                 "It might still be tearing down.";
   return false;
 }
 
 }  // namespace forwarder2