GitLab

Also cleaned up the code a bit.

R=peria
BUG=673213

Review-Url: https://codereview.chromium.org/2568863003
Cr-Commit-Position: refs/heads/master@{#438168}