Cleanup comments, unit tests and unnecessary early out.

Review URL: https://codereview.chromium.org/545663002

Cr-Commit-Position: refs/heads/master@{#294206}
3 files changed