GitLab

Made a minor change to make sure that SetupTestServer interacts
properly with the new _ConnectPortForwardingTask and ForwardingScheme
versions.

Change-Id: I16add737f7595fac416973c1296882f9f40d0dc1
Reviewed-on: https://chromium-review.googlesource.com/1178381Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583900}