GitLab

- Remove unused includes.
- Use auto and nullptr.
- Simplify code.

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