Revert "Fix a ton of compiler warnings."

This reverts commit r24792.

TBR=estade

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


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

5 files changed, 7 insertions, 10 deletions

diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index 343344b..d13da89 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_TRUE(NULL == test_stream_->playback_handle_);
+  EXPECT_EQ(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 40b0b81..93af4a9 100644
--- a/media/base/clock.h
+++ b/media/base/clock.h
@@ -40,9 +40,6 @@ 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 a31f9ab..078f54b 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_TRUE(NULL == reader->buffer()->GetData());
+  EXPECT_EQ(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_TRUE(NULL == reader->buffer()->GetData());
+  EXPECT_EQ(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 43d5b29..d977b08 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_(0),
+      thread_(NULL),
       shutdown_(false) {
 }
 
@@ -89,7 +89,7 @@ void NullAudioRenderer::OnStop() {
   shutdown_ = true;
   if (thread_) {
     PlatformThread::Join(thread_);
-    thread_ = 0;
+    thread_ = NULL;
   }
 }
 
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 1539490..5a320c9 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_(0),
+      thread_(NULL),
       pending_reads_(0),
       playback_rate_(0) {
 }
@@ -105,7 +105,7 @@ void VideoRendererBase::Stop() {
       AutoUnlock auto_unlock(lock_);
       PlatformThread::Join(thread_);
     }
-    thread_ = 0;
+    thread_ = NULL;
   }
 }