summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 22:05:46 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 22:05:46 +0000
commit227f100003cfd66398373a29c61e7dbbdd8fc892 (patch)
treedf06637aeeba02342eb1985e32b8b6faf18e4b3d /chrome/test/plugin
parentc1627603442a9f72091b13cd990d74541dd8f99d (diff)
downloadchromium_src-227f100003cfd66398373a29c61e7dbbdd8fc892.zip
chromium_src-227f100003cfd66398373a29c61e7dbbdd8fc892.tar.gz
chromium_src-227f100003cfd66398373a29c61e7dbbdd8fc892.tar.bz2
Try renabling the WMP plugin tests again. The new one works on my Windows 7 box, the old one I can't run since I don't have an XP box.
BUG=4809 Review URL: http://codereview.chromium.org/208014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 767fa28..86d1c5f 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -143,12 +143,11 @@ TEST_F(PluginTest, Quicktime) {
TestPlugin(L"quicktime.html", kShortWaitTimeout, false);
}
-TEST_F(PluginTest, DISABLED_MediaPlayerNew) {
+TEST_F(PluginTest, MediaPlayerNew) {
TestPlugin(L"wmp_new.html", kShortWaitTimeout, false);
}
-// http://crbug.com/4809
-TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
+TEST_F(PluginTest, MediaPlayerOld) {
TestPlugin(L"wmp_old.html", kLongWaitTimeout, false);
}