GitLab

The 1-parameter version is simpler, and the 2-parameter version is
deprecated. Fix a few lint errors along the way.

Bug: 1009837
Change-Id: I01943e6090fa4103f7464f5d01f4003af9f5948e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285918Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786178}