Revert 180600

      > Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/
> 
> BUG=172573
> Review URL: https://codereview.chromium.org/12177018

Windows and aura bots are failing, and this is the only CL
in range that had no passing try runs for those tests.
If the bots don't go green, I'll unrevert the revert.

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

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