Another trivial cleanup

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1229303003
13 files changed