Clean up and modernize the feedback code

BUG=634518
TEST=Tests should keep passing.

Review-Url: https://codereview.chromium.org/2217163003
Cr-Commit-Position: refs/heads/master@{#410223}
6 files changed