Index: media/test/pipeline_integration_test.cc |
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc |
index 43da5c1d69ea4d6f97f6e728ca385208fa451605..b2192211f94bc338a80374cf8d03b234e1f3f988 100644 |
--- a/media/test/pipeline_integration_test.cc |
+++ b/media/test/pipeline_integration_test.cc |
@@ -1347,10 +1347,15 @@ TEST_P(Mp3FastSeekIntegrationTest, FastSeekAccuracy_MP3) { |
INSTANTIATE_TEST_CASE_P( |
CBRSeeks, |
Mp3FastSeekIntegrationTest, |
- ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", |
- "-0.71,0.36,2.96,2.68,2.10,-1.08,"), |
- Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", |
- "0.95,0.56,1.34,0.47,1.77,0.84,"))); |
+ ::testing::Values( |
+// TODO(CHCUNNINGHAM): Re-enable for OSX once 1% flakiness is root caused. |
wolenetz
2016/01/28 23:26:46
really minor nit. in future, lower case the conten
chcunningham1
2016/01/29 01:29:33
Acknowledged.
|
+// See http://crbug.com/571898 |
+#if !defined(OS_MACOSX) |
wolenetz
2016/01/28 23:45:35
windows bot is complaining. macro substitution is
chcunningham1
2016/01/29 01:29:33
Done.
|
+ Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", |
+ "-0.71,0.36,2.96,2.68,2.10,-1.08,"), |
+#endif |
+ Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", |
+ "0.95,0.56,1.34,0.47,1.77,0.84,"))); |
// VBR seeks can be fast *OR* accurate, but not both. We chose fast. |
INSTANTIATE_TEST_CASE_P( |