Revert of https://codereview.chromium.org/113093002/
Reason for revert: broke this bot: http://build.chromium.org/p/chromium.win/builders/Interactive%20Tests%20%28dbg%29/builds/44454

TBR=sky@chromium.org,gbillock@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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