diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 08:59:40 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 08:59:40 +0000 |
| commit | 016fb2e26a4f8c726138c04cd46472e907acf250 (patch) | |
| tree | d6559d608f29c39e58f5f3726d108138d3e57a10 /media/base | |
| parent | a3b199ac0f0d1dea5c2db2899c3e89b536c3ba4e (diff) | |
| download | chromium_src-016fb2e26a4f8c726138c04cd46472e907acf250.zip chromium_src-016fb2e26a4f8c726138c04cd46472e907acf250.tar.gz chromium_src-016fb2e26a4f8c726138c04cd46472e907acf250.tar.bz2 | |
Revert 111320 - Disable PipelineImplTest.AudioStream on OS X
BUG=105234
Review URL: http://codereview.chromium.org/8679001
TBR=rsleevi@chromium.org
Review URL: http://codereview.chromium.org/8678004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/pipeline_impl_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index ebfd26e..07f773d 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc @@ -381,13 +381,7 @@ TEST_F(PipelineImplTest, NoStreams) { EXPECT_FALSE(pipeline_->IsInitialized()); } -#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) { +TEST_F(PipelineImplTest, AudioStream) { CreateAudioStream(); MockDemuxerStreamVector streams; streams.push_back(audio_stream()); |