GitLab

Also fixes some cpp lint warnings; no functional changes.

Bug: 1010217
Change-Id: I50e8b55a7f63402bba2aa0990c7d445bd8665e1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446990Reviewed-by: Ben Wells <benwells@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814503}