roll 67952:67957
roll 67952:67957

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

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