Revert of https://codereview.chromium.org/105393008/
Reason for revert: Compile failure even when it went through CQ.

TBR=cjhopman@chromium.org,yfriedman@chromium.org,nyquist@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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