GitLab

Also fix a few cpplint warnings. No functional changes.

Bug: 1010217
Change-Id: Iee89be21a9600d480b8c03312c1150d3e35946e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378896Reviewed-by: James MacLean <wjmaclean@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: David Bertoni <dbertoni@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803720}