Change DCHECK_IS_ON() to DCHECK_IS_ON

content/common/gpu/media/gpu_video_decode_accelerator.cc

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index 9ec813983645bef94c86d0470861d9c00ce2ecae..342cf6b1aff3c9980b3a7d52ce988975b3b84564 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -55,26 +55,14 @@ static bool MakeDecoderContextCurrent(
   return true;
 }
 
-// A helper class that works like AutoLock but only acquires the lock when

[Nico, 2014/03/12 21:16:42]

keep this comment

[Xianzhu, 2014/03/12 21:39:13]

Done.

-// DCHECK is on.
+#if DCHECK_IS_ON
+typedef base::AutoLock DebugAutoLock;
+#else
 class DebugAutoLock {
  public:
-  explicit DebugAutoLock(base::Lock& lock) : lock_(lock) {
-    if (DCHECK_IS_ON())
-      lock_.Acquire();
-  }
-
-  ~DebugAutoLock() {
-    if (DCHECK_IS_ON()) {
-      lock_.AssertAcquired();
-      lock_.Release();
-    }
-  }
-
- private:
-  base::Lock& lock_;
-  DISALLOW_COPY_AND_ASSIGN(DebugAutoLock);
+  explicit DebugAutoLock(base::Lock&) {}
 };
+#endif
 
 class GpuVideoDecodeAccelerator::MessageFilter
     : public IPC::ChannelProxy::MessageFilter {
@@ -213,10 +201,8 @@ void GpuVideoDecodeAccelerator::PictureReady(
     SetTextureCleared(picture);
   } else {
     DCHECK(io_message_loop_->BelongsToCurrentThread());
-    if (DCHECK_IS_ON()) {
-      DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
-      DCHECK_EQ(0u, uncleared_textures_.count(picture.picture_buffer_id()));
-    }
+    DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
+    DCHECK_EQ(0u, uncleared_textures_.count(picture.picture_buffer_id()));
   }
 
   if (!Send(new AcceleratedVideoDecoderHostMsg_PictureReady(