Fix build failure due to bad merge resolve
Fix build failure due to bad merge resolve

BUG=43259
TEST=none


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

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