cc: Switch to Chromium DCHECKs and LOGs

cc/layer_impl.h

Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index e34ccc86a03735ced93f7b813cb97882335725d9..6458b4ca5187bef75fab017785bfa9b4205c0673 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -6,6 +6,7 @@
 #define CCLayerImpl_h
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/dcheck.h"
 #include "cc/scoped_ptr_vector.h"
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
@@ -161,7 +162,7 @@ public:
     bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
     void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
 
-    CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
+    CCLayerImpl* renderTarget() const { CC_DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
     void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; }
 
     void setBounds(const IntSize&);
@@ -368,7 +369,7 @@ private:
     bool m_drawTransformIsAnimating;
     bool m_screenSpaceTransformIsAnimating;
 
-#ifndef NDEBUG
+#if CC_DCHECK_ENABLED
     bool m_betweenWillDrawAndDidDraw;
 #endif