Revert of https://codereview.chromium.org/120503005/
Reason for revert: views_unittest failures... :-(

TBR=sky@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=131660

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

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