[chromedriver] Reuse forwarded adb ports.

chrome/test/chromedriver/session_commands.cc

 // Copyright (c) 2013 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 "chrome/test/chromedriver/session_commands.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 39 matching lines @@
   return true;
 }
 
 }  // namespace
 
 InitSessionParams::InitSessionParams(
     scoped_refptr<URLRequestContextGetter> context_getter,
     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() {}
 
 namespace {
 
 scoped_ptr<base::DictionaryValue> CreateCapabilities(Chrome* chrome) {
   scoped_ptr<base::DictionaryValue> caps(new base::DictionaryValue());
   caps->SetString("browserName", "chrome");
   caps->SetString("version", chrome->GetVersion());
   caps->SetString("chrome.chromedriverVersion", kChromeDriverVersion);
@@ skipping 51 matching lines @@
                       &session->devtools_logs,
                       &devtools_event_listeners);
   if (status.IsError())
     return status;
 
   status = LaunchChrome(bound_params.context_getter.get(),
                         bound_params.socket_factory,
                         bound_params.device_manager,
                         bound_params.port_server,
                         bound_params.port_manager,
+                        bound_params.port_manager_android,
                         capabilities,
                         devtools_event_listeners,
                         &session->chrome);
   if (status.IsError())
     return status;
 
   std::list<std::string> web_view_ids;
   status = session->chrome->GetWebViewIds(&web_view_ids);
   if (status.IsError() || web_view_ids.empty()) {
     return status.IsError() ? status :
         Status(kUnknownError, "unable to discover open window in chrome");
   }
 
   session->window = web_view_ids.front();
   session->detach = capabilities.detach;
   session->force_devtools_screenshot = capabilities.force_devtools_screenshot;
   session->capabilities = CreateCapabilities(session->chrome.get());
   value->reset(session->capabilities->DeepCopy());
   return Status(kOk);
 }
 
 }  // namespace
 
 Status ExecuteInitSession(
     const InitSessionParams& bound_params,
     Session* session,
     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;
 }
 
 Status ExecuteQuit(
     bool allow_detach,
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   session->quit = true;
   if (allow_detach && session->detach)
@@ skipping 422 matching lines @@
   }
   std::string error_msg;
   base::FilePath upload;
   Status status = UnzipSoleFile(upload_dir, zip_data, &upload);
   if (status.IsError())
     return Status(kUnknownError, "unable to unzip 'file'", status);
 
   value->reset(new base::StringValue(upload.value()));
   return Status(kOk);
 }