GitLab

This is a follow-up refactoring CL to
https://chromium.googlesource.com/chromium/src/+/e3b4260ee889203e9d9ec9852412f7a767018417

TEST=unit tests pass
BUG=953658

Change-Id: I4f024f5f550225c7ae68ccf5b56ac0d704e6932b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1580141
Commit-Queue: Tim Song <tengs@chromium.org>
Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653452}