Fix compile failure due to bad merge.
Fix compile failure due to bad merge.


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

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