Revert of https://codereview.chromium.org/92153002/
Reason for revert: broke compile

TBR=joaodasilva@chromium.org,jochen@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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