Add extra content_shell per worker for virtual tests, except on Android.

Add extra content_shell per worker for virtual tests, except on Android.

This is a rollforward of reverted issue 1161863003, which caused
android tests to crash when running multiple content_shells per worker.

This fixes the problem by enforcing a port-specific max number of content_shells per worker.

Original CL: https://codereview.chromium.org/1161863003/
Revert CL: https://codereview.chromium.org/1158323009/

BUG=471431
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=197056

[joelo, 2015-06-05 21:56:52]

joelo@chromium.org changed reviewers:
+ dpranke@google.com, ojan@chromium.org

[joelo, 2015-06-05 21:59:45]

joelo@chromium.org changed reviewers:
+ dpranke@chromium.org, leviw@chromium.org
- dpranke@google.com

[joelo, 2015-06-05 22:06:30]

dpranke@, ojan@, leviw@: ptal?

[Dirk Pranke, 2015-06-08 17:02:35]

lgtm w/ changes addressed.

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
(right):

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:241: if
self._port.default_max_drivers_per_process > 1:
default_max_drivers_per_process is a method, not an attribute (you're missing
the parens).

Also, I would drop the "default_" part, since there's no way to change this at
runtime.

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
(right):

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:81: if
(secondary_driver is not None and
You don't need the "is not None" part.

[joelo, 2015-06-08 20:34:08]

Thanks dpranke@. Will attempt to run tests on android before submitting.

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py
(right):

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:241: if
self._port.default_max_drivers_per_process > 1:
On 2015/06/08 17:02:34, Dirk Pranke wrote:
> default_max_drivers_per_process is a method, not an attribute (you're missing
> the parens).
> 
> Also, I would drop the "default_" part, since there's no way to change this at
> runtime.

Whoops, good catch.

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
File Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
(right):

https://codereview.chromium.org/1154343007/diff/20001/Tools/Scripts/webkitpy/...
Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:81: if
(secondary_driver is not None and
On 2015/06/08 17:02:35, Dirk Pranke wrote:
> You don't need the "is not None" part.

Done.

[joelo, 2015-06-12 18:18:58]

The CQ bit was checked by joelo@chromium.org

[joelo, 2015-06-12 18:18:58]

The patchset sent to the CQ was uploaded after l-g-t-m from dpranke@chromium.org
Link to the patchset: https://codereview.chromium.org/1154343007/#ps60001
(title: "merge")

[commit-bot: I haz the power, 2015-06-12 18:19:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1154343007/60001

[commit-bot: I haz the power, 2015-06-12 19:38:40]

Committed patchset #4 (id:60001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=197056