GitLab

The latter is simpler, and allows for some code removal.

BUG=none

Change-Id: Ifaf2fd855e07c2c56cbc13920f17acd29055b9ed
Reviewed-on: https://chromium-review.googlesource.com/1196233Reviewed-by: François Doray <fdoray@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587604}