GitLab

Change the API around a little so that we can mock out the callback to
ensure that we are calling in the correct scenarios.

BUG=637640

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