GitLab

Also fix cpp lint warnings. No functional changes.

Bug: 1010217
Change-Id: I60c13a4f4667522c7661b3ab91b948e71a06e657
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432204
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811059}