summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 02:05:10 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 02:05:10 +0000
commit4280c86d8a88ae222af1f7571e55e9e4d29ad203 (patch)
treeebaf5af69a78422353a5127c4ebbb5e9dbff9995 /chrome/test/plugin
parent4566f13fe843c0821dbce19d7ea5e8aece8afe4a (diff)
downloadchromium_src-4280c86d8a88ae222af1f7571e55e9e4d29ad203.zip
chromium_src-4280c86d8a88ae222af1f7571e55e9e4d29ad203.tar.gz
chromium_src-4280c86d8a88ae222af1f7571e55e9e4d29ad203.tar.bz2
Restore bretts change (reverting 11506) and disabling java test
tbr=brettw Review URL: http://codereview.chromium.org/43118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 07e764a..54d9b17 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -160,7 +160,8 @@ TEST_F(PluginTest, FlashSecurity) {
TestPlugin(L"flash.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, Java) {
+// http://crbug.com/8690
+TEST_F(PluginTest, DISABLED_Java) {
TestPlugin(L"Java.html", kShortWaitTimeout);
}