Revert r14620 which was a rollback of r14549 and r14508.  This
change re-enables the ui tests.  Since jam re-enabled some tests,
I had to #ifdef around 4 tests that are not shutting down cleanly
on linux.  It looks like we have renderers that aren't shutting
down properly (pegged at 100% cpu).

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


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14680 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed