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

This reverts commit 78422af7d04c5a0244677f8f80258ee1173ba0d3.

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

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

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@36453 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser