GitLab

I missed out on removing a few things in http://crrev.com/2571063002, which I've cleaned up here.

BUG=673844

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