From 34a43dba701101a39624b488a821666643088e35 Mon Sep 17 00:00:00 2001
From: "rsleevi@chromium.org"
 <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 23 Nov 2011 05:46:05 +0000
Subject: [PATCH] Disable PipelineImplTest.AudioStream on OS X

BUG=105234

Review URL: http://codereview.chromium.org/8679001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111320 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/base/pipeline_impl_unittest.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 07f773d80e1ac9..ebfd26ee2bbc30 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());