Fix linux/mac build errors.
Fix linux/mac build errors.

TBR=jrg
BUG=none
TEST=none


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

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