chrome/test/chromedriver/server/http_handler.cc - Issue 127143003: [chromedriver] Reuse forwarded adb ports.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/chromedriver/server/http_handler.cc

Issue 127143003: [chromedriver] Reuse forwarded adb ports. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/test/chromedriver/net/port_server.cc ('K') | « chrome/test/chromedriver/server/http_handler.h ('k') | chrome/test/chromedriver/session_commands.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/chromedriver/server/http_handler.cc

diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc

index 86cc76cb475247fc9167d342a85f38cd3e8495df..b73e4f7210ad940f8b6ae8df853e88db7ca97b29 100644

--- a/chrome/test/chromedriver/server/http_handler.cc

+++ b/chrome/test/chromedriver/server/http_handler.cc

@@ -80,7 +80,8 @@ HttpHandler::HttpHandler(

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(

@@ -89,13 +90,15 @@ HttpHandler::HttpHandler(

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",

« chrome/test/chromedriver/net/port_server.cc ('K') | « chrome/test/chromedriver/server/http_handler.h ('k') | chrome/test/chromedriver/session_commands.h » ('j') | no next file with comments »