Make cpplint happy.

TBR=machenbach@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#25699}
(cherry picked from commit 11b52971d9981b713a0d53d4b354cae05f555edf)
Merge pull request #72 from rakuco/backport-cpplint-fixes

Backport 11b5297 from upstream: Make cpplint happy.