summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 18:30:42 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 18:30:42 +0000
commitae2a458f5f58e11ee44dc7fea795c8b06256c82d (patch)
tree1be18ae0d17a042d9a9c60d62a926e070ec0269b
parent062b4f1a631affc0e9061c6ea56cb03ef929c5f6 (diff)
downloadchromium_src-ae2a458f5f58e11ee44dc7fea795c8b06256c82d.zip
chromium_src-ae2a458f5f58e11ee44dc7fea795c8b06256c82d.tar.gz
chromium_src-ae2a458f5f58e11ee44dc7fea795c8b06256c82d.tar.bz2
Reinstate the test on Windows, as FLAKY, so we can capture some failure data.
BUG=95558 TEST=Test doesn't close tree due to failures on Windows. Review URL: http://codereview.chromium.org/8390029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107394 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/ui/npapi_uitest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 8f4a12d..d313a2c 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -162,8 +162,10 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
// http://crbug.com/95558
// This test fails frequently on Mac and windows, so it is disabled for now.
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_MACOSX)
#define MAYBE_DeletePluginInDeallocate DISABLED_DeletePluginInDeallocate
+#elif defined(OS_WIN)
+#define MAYBE_DeletePluginInDeallocate FLAKY_DeletePluginInDeallocate
#else
#define MAYBE_DeletePluginInDeallocate DeletePluginInDeallocate
#endif