Manually merging trunk rev 83760 as file has changed location and drover fails to do the merge.
Manually merging trunk rev 83760 as file has changed location and drover fails to do the merge.

BUG=80847
TBR=apatrick@chromium.org

git-svn-id: http://src.chromium.org/svn/branches/742/src@83766 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: 6f3bc15949c6fb370bfbe371c97394c2d169ffcb
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser