summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 04:46:45 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 04:46:45 +0000
commit58e46ec324e73fdbf8dcb8063f3154ffa340f2f3 (patch)
tree5e8b17e2bf7762bd459c038747d32ea0e34397db /chrome/test
parent05c18e87bbb87f10721fc4f3dbbd182349ebfa28 (diff)
downloadchromium_src-58e46ec324e73fdbf8dcb8063f3154ffa340f2f3.zip
chromium_src-58e46ec324e73fdbf8dcb8063f3154ffa340f2f3.tar.gz
chromium_src-58e46ec324e73fdbf8dcb8063f3154ffa340f2f3.tar.bz2
Re-enable java plugin test (reverting 11510)
The bot was trying to auto-update... and no one was clicking "yes." bug=8690 tbr=brettw Review URL: http://codereview.chromium.org/42112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/plugin/plugin_test.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 54d9b17..07e764a 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -160,8 +160,7 @@ TEST_F(PluginTest, FlashSecurity) {
TestPlugin(L"flash.html", kShortWaitTimeout);
}
-// http://crbug.com/8690
-TEST_F(PluginTest, DISABLED_Java) {
+TEST_F(PluginTest, Java) {
TestPlugin(L"Java.html", kShortWaitTimeout);
}