Index: media/cast/receiver/audio_decoder_unittest.cc |
diff --git a/media/cast/receiver/audio_decoder_unittest.cc b/media/cast/receiver/audio_decoder_unittest.cc |
index 576e9dbce57ac67fb1cfe339a715ed4d5e679a4f..1433ac4a763e3c1bb60cc5586ca524f5bf9ccfe4 100644 |
--- a/media/cast/receiver/audio_decoder_unittest.cc |
+++ b/media/cast/receiver/audio_decoder_unittest.cc |
@@ -190,6 +190,8 @@ class AudioDecoderTest : public ::testing::TestWithParam<TestScenario> { |
DISALLOW_COPY_AND_ASSIGN(AudioDecoderTest); |
}; |
+#if !defined(OS_LINUX) |
+// http://crbug.com/396480 |
TEST_P(AudioDecoderTest, DecodesFramesWithSameDuration) { |
viettrungluu
2014/07/23 15:26:42
You can't disable a parametrized test (TEST_P) usi
jam
2014/07/23 16:02:06
ah i wasn't sure, just tested and done
|
const base::TimeDelta kTenMilliseconds = |
base::TimeDelta::FromMilliseconds(10); |
@@ -209,6 +211,7 @@ TEST_P(AudioDecoderTest, DecodesFramesWithVaryingDuration) { |
FeedMoreAudio(base::TimeDelta::FromMilliseconds(kFrameDurationMs[i]), 0); |
WaitForAllAudioToBeDecoded(); |
} |
+#endif |
TEST_P(AudioDecoderTest, RecoversFromDroppedFrames) { |
const base::TimeDelta kTenMilliseconds = |