Use the new forwarder2's Daemon implementation in device_forwarder.

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"
@@ skipping 46 matching lines @@
 }
 
 void DeviceController::Start() {
   while (true) {
     CleanUpDeadListeners();
     scoped_ptr<Socket> socket(new Socket);
     if (!kickstart_adb_socket_.Accept(socket.get())) {
       if (!kickstart_adb_socket_.exited()) {
         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_);
     int port;
     command::Type command;
     if (!ReadCommand(socket.get(), &port, &command)) {
       LOG(ERROR) << "Invalid command received.";
-      socket->Close();
       continue;
     }
     DeviceListener* listener = listeners_.Lookup(port);
     switch (command) {
       case command::LISTEN: {
         if (listener != NULL) {
           LOG(WARNING) << "Already forwarding port " << port
                        << ". Attempting to restart the listener.\n";
           listener->ForceExit();
           listener->Join();
@@ skipping 16 matching lines @@
         LOG(INFO) << "Forwarding device port " << listener_port << " to host.";
         break;
       }
       case command::DATA_CONNECTION:
         if (listener == NULL) {
           LOG(ERROR) << "Data Connection command received, but "
                      << "listener has not been set up yet for port " << port;
           // After this point it is assumed that, once we close our Adb Data
           // socket, the Adb forwarder command will propagate the closing of
           // sockets all the way to the host side.
-          socket->Close();
           continue;
         } else if (!listener->SetAdbDataSocket(socket.Pass())) {
           LOG(ERROR) << "Could not set Adb Data Socket for port: " << port;
           // Same assumption as above, but in this case the socket is closed
           // inside SetAdbDataSocket.
           continue;
         }
         break;
       default:
         // TODO(felipeg): add a KillAllListeners command.
         LOG(ERROR) << "Invalid command received. Port: " << port
                    << " Command: " << command;
-        socket->Close();
     }
   }
   KillAllListeners();
   CleanUpDeadListeners();
-  kickstart_adb_socket_.Close();
 }
 
 }  // namespace forwarder