Fix a ton of compiler warnings.

Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.

BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest

patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 7 deletions

diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index d13da89..343344b 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(NULL == test_stream_->playback_handle_);
   EXPECT_FALSE(test_stream_->packet_.get());
   EXPECT_TRUE(test_stream_->stop_stream_);
 }
diff --git a/media/base/clock.h b/media/base/clock.h
index 93af4a9..40b0b81 100644
--- a/media/base/clock.h
+++ b/media/base/clock.h
@@ -40,6 +40,9 @@ class Clock {
 
   // Returns the current elapsed media time.
   virtual base::TimeDelta Elapsed() const = 0;
+
+ protected:
+  ~Clock() {}
 };
 
 }  // namespace media
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 078f54b..a31f9ab 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(NULL == reader->buffer()->GetData());
   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(NULL == reader->buffer()->GetData());
   EXPECT_EQ(0u, reader->buffer()->GetDataSize());
 
   // Manually release buffer, which should release any remaining AVPackets.
diff --git a/media/filters/null_audio_renderer.cc b/media/filters/null_audio_renderer.cc
index d977b08..43d5b29 100644
--- a/media/filters/null_audio_renderer.cc
+++ b/media/filters/null_audio_renderer.cc
@@ -18,7 +18,7 @@ NullAudioRenderer::NullAudioRenderer()
     : AudioRendererBase(),
       bytes_per_millisecond_(0),
       buffer_size_(0),
-      thread_(NULL),
+      thread_(0),
       shutdown_(false) {
 }
 
@@ -89,7 +89,7 @@ void NullAudioRenderer::OnStop() {
   shutdown_ = true;
   if (thread_) {
     PlatformThread::Join(thread_);
-    thread_ = NULL;
+    thread_ = 0;
   }
 }
 
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 5a320c9..1539490 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -39,7 +39,7 @@ VideoRendererBase::VideoRendererBase()
       height_(0),
       frame_available_(&lock_),
       state_(kUninitialized),
-      thread_(NULL),
+      thread_(0),
       pending_reads_(0),
       playback_rate_(0) {
 }
@@ -105,7 +105,7 @@ void VideoRendererBase::Stop() {
       AutoUnlock auto_unlock(lock_);
       PlatformThread::Join(thread_);
     }
-    thread_ = NULL;
+    thread_ = 0;
   }
 }