GitLab

This is some more "pre cleanup" of code that the linter complains about
when moving code into storage service.  Doing this ahead of time to
make the future gigantic move CL easier to reason about.

Bug: 1015214
Change-Id: I7dcd977b7906710a7516412a11d83d64661d19fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093051
Auto-Submit: enne <enne@chromium.org>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748860}