WK roll 67957:67965
WK roll 67957:67965

BUG=none
TEST=none

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

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

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