summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-28 21:48:52 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-28 21:48:52 +0000
commita5b6ad445377fc7de11cb7d7270c800737fea101 (patch)
tree3876adc91dedd428bb4c3d71c33654aee932b2da /media
parentcd030342fca16bfe81cce764d896ac9c5808b8d4 (diff)
downloadchromium_src-a5b6ad445377fc7de11cb7d7270c800737fea101.zip
chromium_src-a5b6ad445377fc7de11cb7d7270c800737fea101.tar.gz
chromium_src-a5b6ad445377fc7de11cb7d7270c800737fea101.tar.bz2
Disable flaky VideoRendererBaseTest.GetCurrentFrame_EndOfStream on Win.
This test sometimes timeouts on Windows bots. TBR=scherkus@chromium.org BUG=109405 Review URL: https://chromiumcodereview.appspot.com/11697008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/video_renderer_base_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 65c29d0..8662b8c 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -491,7 +491,7 @@ TEST_F(VideoRendererBaseTest, GetCurrentFrame_Flushed) {
Shutdown();
}
-#if defined(OS_MACOSX) || defined(ADDRESS_SANITIZER)
+#if defined(OS_MACOSX) || defined(ADDRESS_SANITIZER) || defined(OS_WIN)
// http://crbug.com/109405
#define MAYBE_GetCurrentFrame_EndOfStream DISABLED_GetCurrentFrame_EndOfStream
#else