GitLab

Reason for revert: Reverting on Canary to maintain port selection there.  Will land on Dev branch.

TBR=wtc@chromium.org,rch@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=329255

Review URL: https://codereview.chromium.org/132603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243979 0039d316-1c4b-4281-b951-d872f2087c98