GitLab

Update comments to reflect latest code and remove unncessary
function and if-statements.

BUG=675004

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