| Index: media/base/pipeline_impl_unittest.cc
|
| diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
|
| index 07f773d80e1ac9db5606278f87a545610617297b..ebfd26ee2bbc30f9d1a2fece15d89f7cd465c918 100644
|
| --- a/media/base/pipeline_impl_unittest.cc
|
| +++ b/media/base/pipeline_impl_unittest.cc
|
| @@ -381,7 +381,13 @@ TEST_F(PipelineImplTest, NoStreams) {
|
| EXPECT_FALSE(pipeline_->IsInitialized());
|
| }
|
|
|
| -TEST_F(PipelineImplTest, AudioStream) {
|
| +#if defined(OS_MACOSX)
|
| +// Crashes on OS X - http://crbug.com/105234
|
| +#define MAYBE_AudioStream DISABLED_AudioStream
|
| +#else
|
| +#define MAYBE_AudioStream AudioStream
|
| +#endif
|
| +TEST_F(PipelineImplTest, MAYBE_AudioStream) {
|
| CreateAudioStream();
|
| MockDemuxerStreamVector streams;
|
| streams.push_back(audio_stream());
|
|
|