Support HTTP test-server based net unit tests on Android.

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 34 matching lines @@
   }
 }
 
 bool DeviceController::Init(const std::string& adb_unix_socket) {
   if (!kickstart_adb_socket_.BindUnix(adb_unix_socket,
                                       true /* abstract */)) {
     LOG(ERROR) << "Could not BindAndListen DeviceController socket on port "
                << adb_unix_socket << ": " << safe_strerror(errno);
     return false;
   }
+  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())) {
-      LOG(ERROR) << "Could not Accept DeviceController socket: "
-                 << safe_strerror(errno);
+      if (!kickstart_adb_socket_.exited()) {
+        LOG(ERROR) << "Could not Accept DeviceController socket: "
+                   << safe_strerror(errno);
+      }
       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;
@@ skipping 15 matching lines @@
         if (!new_listener->BindListenerSocket())
           continue;
         new_listener->Start();
         // |port| can be zero, to allow dynamically allocated port, so instead,
         // we call DeviceListener::listener_port() to retrieve the currently
         // allocated port to this new listener, which has been set by the
         // BindListenerSocket() method in case of success.
         const int listener_port = new_listener->listener_port();
         // |new_listener| is now owned by listeners_ map.
         listeners_.AddWithID(new_listener.release(), listener_port);
-        printf("Forwarding device port %d to host.\n", listener_port);
+        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();
-        continue;
-        break;
     }
   }
   KillAllListeners();
   CleanUpDeadListeners();
   kickstart_adb_socket_.Close();
 }
 
 }  // namespace forwarder