summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-13 02:41:10 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-13 02:41:10 +0000
commit8f7c7cd0eb53a8336a2db1d2b90818305e76706b (patch)
treea263b380f0678f0c227d3dc9ebee94ee123df427 /media/audio
parent35fac8f8ad037cee4405b1f8aa7b3dad94dc36ec (diff)
downloadchromium_src-8f7c7cd0eb53a8336a2db1d2b90818305e76706b.zip
chromium_src-8f7c7cd0eb53a8336a2db1d2b90818305e76706b.tar.gz
chromium_src-8f7c7cd0eb53a8336a2db1d2b90818305e76706b.tar.bz2
Fix crash in WinAudioTest.PCMWaveStreamOpenLimit.
BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6487024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/win/audio_output_win_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 7665d08..50483b4 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -286,8 +286,9 @@ TEST(WinAudioTest, PCMWaveStreamOpenLimit) {
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, 2, 8000, 16,
1024 * 1024 * 1024));
- ASSERT_TRUE(NULL == oas);
- oas->Close();
+ EXPECT_TRUE(NULL == oas);
+ if (oas)
+ oas->Close();
}
// Test that it uses the triple buffers correctly. Because it uses the actual