diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
| commit | 9b6fee14acedde5c6b627d5f9b691776fc8d868c (patch) | |
| tree | 8cd3438dc3b6504066f89096e37db4cff4b903ed /media | |
| parent | b1ed7b9beaf3069b54084c453da6db6bed56607c (diff) | |
| download | chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.zip chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.gz chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.bz2 | |
Avoid potential "NULL used as int" warnings by changing ASSERT_EQ(NULL, ...) to ASSERT_TRUE(... == NULL). Patch by Jacob Mandelson (see http://codereview.chromium.org/202057 ), r=me.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/linux/alsa_output_unittest.cc | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_demuxer_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc index d13da89..e20526e 100644 --- a/media/audio/linux/alsa_output_unittest.cc +++ b/media/audio/linux/alsa_output_unittest.cc @@ -215,7 +215,7 @@ TEST_F(AlsaPcmOutputStreamTest, OpenClose) { test_stream_->Close(); message_loop_.RunAllPending(); - EXPECT_EQ(NULL, test_stream_->playback_handle_); + EXPECT_TRUE(test_stream_->playback_handle_ == NULL); EXPECT_FALSE(test_stream_->packet_.get()); EXPECT_TRUE(test_stream_->stop_stream_); } diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 2bea53a..6a233b6 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -396,7 +396,7 @@ TEST_F(FFmpegDemuxerTest, Read) { EXPECT_TRUE(reader->called()); ASSERT_TRUE(reader->buffer()); EXPECT_TRUE(reader->buffer()->IsEndOfStream()); - EXPECT_EQ(NULL, reader->buffer()->GetData()); + EXPECT_TRUE(reader->buffer()->GetData() == NULL); EXPECT_EQ(0u, reader->buffer()->GetDataSize()); // Manually release buffer, which should release any remaining AVPackets. @@ -410,7 +410,7 @@ TEST_F(FFmpegDemuxerTest, Read) { EXPECT_TRUE(reader->called()); ASSERT_TRUE(reader->buffer()); EXPECT_TRUE(reader->buffer()->IsEndOfStream()); - EXPECT_EQ(NULL, reader->buffer()->GetData()); + EXPECT_TRUE(reader->buffer()->GetData() == NULL); EXPECT_EQ(0u, reader->buffer()->GetDataSize()); // Manually release buffer, which should release any remaining AVPackets. |