Change DCHECK_IS_ON() to DCHECK_IS_ON

content/common/gpu/media/gpu_video_decode_accelerator.cc

 // Copyright (c) 2012 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.
 
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 37 matching lines @@
   }
 
   if (!stub->decoder()->MakeCurrent()) {
     DLOG(ERROR) << "Failed to MakeCurrent()";
     return false;
   }
 
   return true;
 }
 
-// A helper class that works like AutoLock but only acquires the lock when
+// DebugAutoLock works like AutoLock but only acquires the lock when
 // 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 {
  public:
   MessageFilter(GpuVideoDecodeAccelerator* owner, int32 host_route_id)
       : owner_(owner), host_route_id_(host_route_id) {}
 
   virtual void OnChannelError() OVERRIDE { channel_ = NULL; }
 
   virtual void OnChannelClosing() OVERRIDE { channel_ = NULL; }
@@ skipping 118 matching lines @@
 
 void GpuVideoDecodeAccelerator::PictureReady(
     const media::Picture& picture) {
   // VDA may call PictureReady on IO thread. SetTextureCleared should run on
   // the child thread. VDA is responsible to call PictureReady on the child
   // thread when a picture buffer is delivered the first time.
   if (child_message_loop_->BelongsToCurrentThread()) {
     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(
           host_route_id_,
           picture.picture_buffer_id(),
           picture.bitstream_buffer_id()))) {
     DLOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_PictureReady) failed";
   }
 }
 
@@ skipping 278 matching lines @@
   scoped_refptr<gpu::gles2::TextureRef> texture_ref = it->second;
   GLenum target = texture_ref->texture()->target();
   gpu::gles2::TextureManager* texture_manager =
       stub_->decoder()->GetContextGroup()->texture_manager();
   DCHECK(!texture_ref->texture()->IsLevelCleared(target, 0));
   texture_manager->SetLevelCleared(texture_ref, target, 0, true);
   uncleared_textures_.erase(it);
 }
 
 }  // namespace content