Updating logging in src/media/. Using DCHECK_EQ/NE/LE() where possible.

BUG=58409
TEST=None

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

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

6 files changed, 10 insertions, 10 deletions

diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 10217f8..af00d0c 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -25,7 +25,7 @@ AudioOutputController::AudioOutputController(EventHandler* handler,
 }
 
 AudioOutputController::~AudioOutputController() {
-  DCHECK(kClosed == state_);
+  DCHECK_EQ(kClosed, state_);
 }
 
 // static
@@ -135,7 +135,7 @@ void AudioOutputController::DoCreate(AudioParameters params) {
   // Close() can be called before DoCreate() is executed.
   if (state_ == kClosed)
     return;
-  DCHECK(state_ == kEmpty);
+  DCHECK_EQ(kEmpty, state_);
 
   if (!AudioManager::GetAudioManager())
     return;
diff --git a/media/audio/test_audio_input_controller_factory.cc b/media/audio/test_audio_input_controller_factory.cc
index a31ed3d..d141c9e 100644
--- a/media/audio/test_audio_input_controller_factory.cc
+++ b/media/audio/test_audio_input_controller_factory.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -35,7 +35,7 @@ AudioInputController* TestAudioInputControllerFactory::Create(
 
 void TestAudioInputControllerFactory::OnTestAudioInputControllerDestroyed(
     TestAudioInputController* controller) {
-  DCHECK(controller_ == controller);
+  DCHECK_EQ(controller_, controller);
   controller_ = NULL;
 }
 
diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc
index a78cf3d..31b3c1c 100644
--- a/media/base/data_buffer.cc
+++ b/media/base/data_buffer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -41,7 +41,7 @@ uint8* DataBuffer::GetWritableData() {
 
 
 void DataBuffer::SetDataSize(size_t data_size) {
-  DCHECK(data_size <= buffer_size_);
+  DCHECK_LE(data_size, buffer_size_);
   data_size_ = data_size;
 }
 
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 25bdf47..d7ad574 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -457,7 +457,7 @@ PipelineImpl::State PipelineImpl::FindNextState(State current) {
 
 void PipelineImpl::SetError(PipelineStatus error) {
   DCHECK(IsRunning());
-  DCHECK(error != PIPELINE_OK) << "PIPELINE_OK isn't an error!";
+  DCHECK_NE(PIPELINE_OK, error);
   VLOG(1) << "Media pipeline error: " << error;
 
   message_loop_->PostTask(FROM_HERE,
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 2d32880..78fa6f4 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -371,7 +371,7 @@ void VideoRendererBase::PutCurrentFrame(scoped_refptr<VideoFrame> frame) {
   // that case, |current_frame_| could be changed before PutCurrentFrame.
   if (pending_paint_) {
     DCHECK(current_frame_.get() == frame.get());
-    DCHECK(pending_paint_with_last_available_ == false);
+    DCHECK(!pending_paint_with_last_available_);
     pending_paint_ = false;
   } else if (pending_paint_with_last_available_) {
     DCHECK(last_available_frame_.get() == frame.get());
diff --git a/media/tools/player_wtl/view.h b/media/tools/player_wtl/view.h
index 5273cd5..29edc69 100644
--- a/media/tools/player_wtl/view.h
+++ b/media/tools/player_wtl/view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -195,7 +195,7 @@ class WtlVideoWindow : public CScrollWindowImpl<WtlVideoWindow> {
 
     bool enable_draw = media::Movie::GetInstance()->GetDrawEnable();
     if (enable_draw) {
-      DCHECK(bm.bmBitsPixel == 32);
+      DCHECK_EQ(32, bm.bmBitsPixel);
       DrawYUV(video_frame,
               movie_dib_bits,
               dibrowbytes,