Revert of https://codereview.chromium.org/112663007/
Reason for revert: Broke XP bots: http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%282%29/builds/32520

TBR=yzshen@chromium.org,scheib@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=298339

Review URL: https://codereview.chromium.org/124313005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243034 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 243034