Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/

BUG=172573
Review URL: https://codereview.chromium.org/12177018
Recommit of: https://codereview.chromium.org/12177018

TBR=cevans@chromium.org
Review URL: https://codereview.chromium.org/12209008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180700 0039d316-1c4b-4281-b951-d872f2087c98
9 files changed