Revert "Revert part of r35312 now that ChromeOS is fixed."
Revert "Revert part of r35312 now that ChromeOS is fixed."

This reverts commit febf7825e1f45a0c49afe325c7c6089ea40c373f [formerly 78422af7d04c5a0244677f8f80258ee1173ba0d3].

TBR=evan@chromium.org
BUG=none
TEST=Basic in ui_tests should pass

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

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

Former-commit-id: 2fb45f464e3c8b0c38595b88c2c01b3a2b734fee
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