Revert of https://codereview.chromium.org/109483003/
Reason for revert: Breaking WIN tests on waterfall

TBR=robertshield@chromium.org,siggi@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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