Fix and resubmit 42959
Fix and resubmit 42959

BUG=none
TEST=none

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

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

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