Add device port unmapping support to forwarder2.

tools/android/forwarder2/forwarder.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/forwarder.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 76 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BufferedCopier);
 };
 
 }  // namespace
 
 Forwarder::Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2)
     : socket1_(socket1.Pass()),
       socket2_(socket2.Pass()) {
   DCHECK(socket1_.get());
   DCHECK(socket2_.get());
-  // The forwarder thread doesn't need to listen to notifications. It can be
-  // keept alive until either the conenction is broken or the program exit.
-  socket1_->reset_exit_notifier_fd();
-  socket2_->reset_exit_notifier_fd();
 }
 
-Forwarder::~Forwarder() {
-  socket1_->Close();
-  socket2_->Close();
-}
+Forwarder::~Forwarder() {}
 
 void Forwarder::Run() {
   const int nfds = Socket::GetHighestFileDescriptor(*socket1_, *socket2_) + 1;
   fd_set read_fds;
   fd_set write_fds;
 
   // Copy from socket1 to socket2
   BufferedCopier buffer1(socket1_.get(), socket2_.get());
 
   // Copy from socket2 to socket1
@@ skipping 27 matching lines @@
   }
 
   delete this;
 }
 
 void Forwarder::Join() {
   NOTREACHED() << "Can't Join a Forwarder thread.";
 }
 
 }  // namespace forwarder