Revert of https://codereview.chromium.org/105953011/
Reason for revert: This breaks my clang build

TBR=kaznacheev@chromium.org,zvorygin@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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