[chromedriver] Reuse forwarded adb ports.

chrome/test/chromedriver/session_commands.cc

Index: chrome/test/chromedriver/session_commands.cc
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index a80aa46baeb0f6f3be972bdec16fc25b28bb8800..0bbf5cb4046df432f982d0c7f75c279dd668dc35 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc
@@ -57,12 +57,14 @@ InitSessionParams::InitSessionParams(
     const SyncWebSocketFactory& socket_factory,
     DeviceManager* device_manager,
     PortServer* port_server,
-    PortManager* port_manager)
+    PortManager* port_manager,
+    PortManager* port_manager_android)
     : context_getter(context_getter),
       socket_factory(socket_factory),
       device_manager(device_manager),
       port_server(port_server),
-      port_manager(port_manager) {}
+      port_manager(port_manager),
+      port_manager_android(port_manager_android) {}
 
 InitSessionParams::~InitSessionParams() {}
 
@@ -134,6 +136,7 @@ Status InitSessionHelper(
                         bound_params.device_manager,
                         bound_params.port_server,
                         bound_params.port_manager,
+                        bound_params.port_manager_android,
                         capabilities,
                         devtools_event_listeners,
                         &session->chrome);
@@ -163,8 +166,11 @@ Status ExecuteInitSession(
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   Status status = InitSessionHelper(bound_params, session, params, value);
-  if (status.IsError())
+  if (status.IsError()) {
     session->quit = true;
+    if (session->chrome != NULL)
+      session->chrome->Quit();
+  }
   return status;
 }