Mismerge due to a revert; fixing.
Mismerge due to a revert; fixing.


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

Former-commit-id: 69d1fb9519117ca6d74e1870e3e2a4186a5d99a4
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