GitLab

This is just an internal cleanup / refactor and has no functional changes.

Change-Id: I4a90d631d5e66822d47df3cc521d6095c6f141fe
Reviewed-on: https://chromium-review.googlesource.com/1054197Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Katie Dektar <katie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558891}