GitLab

Also fixes a few cpp lint warnings. No functional changes.

Bug: 1010217
Change-Id: If2e666a7b57f92a0f8dce2c1b81957d89adc9122
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416848Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807989}