summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-11 23:47:49 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-11 23:47:49 +0000
commite95f2b94188abcd9df9cdf3c0c054194e53e2814 (patch)
treeb24a094378a1f2c09d8bfbf0377e8621b6161a32 /chrome/test/plugin
parentf6ff0dfd962666d79e4919e23c0078283fed2922 (diff)
downloadchromium_src-e95f2b94188abcd9df9cdf3c0c054194e53e2814.zip
chromium_src-e95f2b94188abcd9df9cdf3c0c054194e53e2814.tar.gz
chromium_src-e95f2b94188abcd9df9cdf3c0c054194e53e2814.tar.bz2
Reenable PluginTests Java and MediaPlayerOld to determine their status.
BUG=disabled test TEST=green bots Review URL: http://codereview.chromium.org/2903005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index d8c81a5..bcd914e 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -150,7 +150,7 @@ TEST_F(PluginTest, MediaPlayerNew) {
}
// http://crbug.com/4809
-TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
+TEST_F(PluginTest, MediaPlayerOld) {
TestPlugin("wmp_old.html", action_max_timeout_ms(), false);
}
@@ -172,7 +172,7 @@ TEST_F(PluginTest, FlashLayoutWhilePainting) {
}
// http://crbug.com/8690
-TEST_F(PluginTest, DISABLED_Java) {
+TEST_F(PluginTest, Java) {
TestPlugin("Java.html", action_max_timeout_ms(), false);
}