[chromedriver] Reuse forwarded adb ports.

chrome/test/chromedriver/server/http_handler.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/server/http_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 62 matching lines @@
       received_shutdown_(false),
       weak_ptr_factory_(this) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
   context_getter_ = new URLRequestContextGetter(io_task_runner);
   socket_factory_ = CreateSyncWebSocketFactory(context_getter_.get());
   adb_.reset(new AdbImpl(io_task_runner, adb_port));
   device_manager_.reset(new DeviceManager(adb_.get()));
   port_server_ = port_server.Pass();
-  port_manager_.reset(new PortManager(12000, 13000));
+  port_manager_.reset(new PortManager(12000, 13000, false));
+  port_manager_android_.reset(new PortManager(12000, 13000, true));
 
   CommandMapping commands[] = {
       CommandMapping(
           kPost,
           internal::kNewSessionPathPattern,
           base::Bind(&ExecuteCreateSession,
                      &session_thread_map_,
                      WrapToCommand(
-                         "InitSession",
-                         base::Bind(&ExecuteInitSession,
-                                    InitSessionParams(context_getter_,
-                                                      socket_factory_,
-                                                      device_manager_.get(),
-                                                      port_server_.get(),
-                                                      port_manager_.get()))))),
+                        "InitSession",
+                        base::Bind(
+                            &ExecuteInitSession,
+                            InitSessionParams(context_getter_,
+                                              socket_factory_,
+                                              device_manager_.get(),
+                                              port_server_.get(),
+                                              port_manager_.get(),
+                                              port_manager_android_.get()))))),
       CommandMapping(kGet,
                      "session/:sessionId",
                      WrapToCommand("GetSessionCapabilities",
                                    base::Bind(&ExecuteGetSessionCapabilities))),
       CommandMapping(kDelete,
                      "session/:sessionId",
                      base::Bind(&ExecuteSessionCommand,
                                 &session_thread_map_,
                                 "Quit",
                                 base::Bind(&ExecuteQuit, false),
@@ skipping 608 matching lines @@
         params.SetString(name, path_parts[i]);
     } else if (command_path_parts[i] != path_parts[i]) {
       return false;
     }
   }
   out_params->MergeDictionary(&params);
   return true;
 }
 
 }  // namespace internal