Revert 240527 "Revert of https://codereview.chromium.org/99133015/"

Reverting the revert, as the Linux Tests(dbg)(1) bot greened itself.

> Revert of https://codereview.chromium.org/99133015/
> Reason for revert: Appears to have caused failures on linux dbg test 1
> 
> TBR=jorgelo@chromium.org,rsesek@chromium.org,mseaborn@chromium.org,piman@chromium.org,jln@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/114483003

TBR=scottmg@chromium.org

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

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