Reland it with the commit log for the record.


Review URL: http://codereview.chromium.org/545123

TBR=jshin@chromium.org
Review URL: http://codereview.chromium.org/551070

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36550 0039d316-1c4b-4281-b951-d872f2087c98