fix compile break due to bad merge
fix compile break due to bad merge

BUG=none
TEST=none
TBR=dmaclach

Review URL: http://codereview.chromium.org/4029003

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

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