GitLab

Split off from https://chromium-review.googlesource.com/c/584857
so that the other non-mechanical cleanup work wouldn't be lost if
this gets reverted.  See that CL for signoff.

Change-Id: Ic75adc756990d3182aba8a323021f328b8419754
Reviewed-on: https://chromium-review.googlesource.com/596070Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491404}