Add device port unmapping support to forwarder2.

tools/android/forwarder2/device_controller.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/device_controller.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/safe_strerror_posix.h"
 #include "tools/android/forwarder2/command.h"
 #include "tools/android/forwarder2/device_listener.h"
 #include "tools/android/forwarder2/socket.h"
 
 namespace forwarder2 {
 
 DeviceController::DeviceController(int exit_notifier_fd)
     : exit_notifier_fd_(exit_notifier_fd) {
-  kickstart_adb_socket_.set_exit_notifier_fd(exit_notifier_fd);
+  kickstart_adb_socket_.AddEventFd(exit_notifier_fd);
 }
 
 DeviceController::~DeviceController() {
   KillAllListeners();
   CleanUpDeadListeners();
   CHECK_EQ(0, listeners_.size());
 }
 
 void DeviceController::CleanUpDeadListeners() {
   // Clean up dead listeners.
@@ skipping 21 matching lines @@
   }
   LOG(INFO) << "Listening on Unix Domain Socket " << adb_unix_socket;
   return true;
 }
 
 void DeviceController::Start() {
   while (true) {
     CleanUpDeadListeners();
     scoped_ptr<Socket> socket(new Socket);
     if (!kickstart_adb_socket_.Accept(socket.get())) {
-      if (!kickstart_adb_socket_.exited()) {
+      if (!kickstart_adb_socket_.DidReceiveEvent()) {
         LOG(ERROR) << "Could not Accept DeviceController socket: "
                    << safe_strerror(errno);
       } else {
         LOG(INFO) << "Received exit notification";
       }
       break;
     }
     // So that |socket| doesn't block on read if it has notifications.
-    socket->set_exit_notifier_fd(exit_notifier_fd_);
+    socket->AddEventFd(exit_notifier_fd_);
     int port;
     command::Type command;
     if (!ReadCommand(socket.get(), &port, &command)) {
       LOG(ERROR) << "Invalid command received.";
       continue;
     }
     DeviceListener* listener = listeners_.Lookup(port);
     switch (command) {
       case command::LISTEN: {
         if (listener != NULL) {
@@ skipping 39 matching lines @@
         // TODO(felipeg): add a KillAllListeners command.
         LOG(ERROR) << "Invalid command received. Port: " << port
                    << " Command: " << command;
     }
   }
   KillAllListeners();
   CleanUpDeadListeners();
 }
 
 }  // namespace forwarder