fix merge failure
fix merge failure

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

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