GitLab

This CL is a reland of the following CL. It fixes the issues that
produced lint warnings.

https://chromium-review.googlesource.com/c/chromium/src/+/2120724

TBR=dominickn@chromium.org, twellington@chromium.org, agrieve@chromium.org, yfriedman@chromium.org

Bug: 980567
Change-Id: Ia48f18c9f10ce3a2239781d0c97174de4d234d7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142251Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758858}