Pull entity fix from upstream.

      BUG=107128
Review URL: http://codereview.chromium.org/9072008

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