Revert of https://codereview.chromium.org/62763003/
Reason for revert: This CL broke interactive tests on mac: http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac10.6%20Tests%20%281%29&number=46945

TBR=koz@chromium.org,mlamouri@chromium.org
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237404 0039d316-1c4b-4281-b951-d872f2087c98
Pull new gn binary @ 237397

BUG=
R=scottmg@chromium.org

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

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