Get -Wreserved-id-macro clean

This should be a strict refactor,
just taking on some old TODOs.

Change-Id: I084799cbc0a96eaa8d81fbc0aa775b9e18c6a387
Reviewed-on: https://skia-review.googlesource.com/150860
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
3 files changed