Revert of https://codereview.chromium.org/103323003/
Reason for revert: Breaking ChromiumOS Build

TBR=jorgelo@chromium.org,jln@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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