Reapply 382 since it wasn't the cause of the build breakage.
Reapply 382 since it wasn't the cause of the build breakage.


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

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