Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

tools/android/forwarder2/host_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/host_controller.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 50 matching lines @@
   forwarder->Start();
 }
 
 bool HostController::Connect() {
   if (!adb_control_socket_.ConnectTcp("", adb_port_)) {
     LOG(ERROR) << "Could not Connect HostController socket on port: "
                << adb_port_;
     return false;
   }
   // Send the command to the device start listening to the "device_forward_port"
-  SendCommand(command::LISTEN, device_port_, &adb_control_socket_);
+  bool send_command_success = SendCommand(
+      command::LISTEN, device_port_, &adb_control_socket_);
+  CHECK(send_command_success);
   int device_port_allocated;
   command::Type command;
   if (!ReadCommand(&adb_control_socket_, &device_port_allocated, &command) ||
       command != command::BIND_SUCCESS) {
     LOG(ERROR) << "Device binding error using port " << device_port_;
     adb_control_socket_.Close();
     return false;
   }
   // When doing dynamically allocation of port, we get the port from the
   // BIND_SUCCESS command we received above.
@@ skipping 32 matching lines @@
     }
     SendCommand(command::HOST_SERVER_SUCCESS,
                 device_port_,
                 &adb_control_socket_);
     StartForwarder(host_server_data_socket.Pass());
   }
   adb_control_socket_.Close();
 }
 
 }  // namespace forwarder2