1 files changed, 6 insertions, 7 deletions
diff --git a/cc/proxy.h b/cc/proxy.h
index 0a68075..cae128e 100644
--- a/cc/proxy.h
+++ b/cc/proxy.h
@@ -6,7 +6,6 @@
 #define CCProxy_h
 
 #include "base/basictypes.h"
-#include "cc/dcheck.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace cc {
@@ -82,7 +81,7 @@ public:
     virtual void acquireLayerTextures() = 0;
 
     // Debug hooks
-#if CC_DCHECK_ENABLED()
+#ifndef NDEBUG
     static bool isMainThread();
     static bool isImplThread();
     static bool isMainThreadBlocked();
@@ -92,7 +91,7 @@ public:
     // Testing hooks
     virtual void loseContext() = 0;
 
-#if CC_DCHECK_ENABLED()
+#ifndef NDEBUG
     static void setCurrentThreadIsImplThread(bool);
 #endif
 
@@ -109,15 +108,15 @@ class DebugScopedSetMainThreadBlocked {
 public:
     DebugScopedSetMainThreadBlocked()
     {
-#if CC_DCHECK_ENABLED()
-        DCHECK(!CCProxy::isMainThreadBlocked());
+#if !ASSERT_DISABLED
+        ASSERT(!CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(true);
 #endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
-#if CC_DCHECK_ENABLED()
-        DCHECK(CCProxy::isMainThreadBlocked());
+#if !ASSERT_DISABLED
+        ASSERT(CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(false);
 #endif
     }