revert the revert
revert the revert

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

This reverts commit 6717ffb85f34b1de756f9a703a68ab7ef8336651.

TBR=evan@chromium.org
BUG=none
TEST=unit_tests should pass except for chromeos build.

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

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

Former-commit-id: 727037cee52ac505f528b0bf788436e93fccc79d
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