cc: Switch to Chromium DCHECKs and LOGs

cc/CCProxy.h

Index: cc/CCProxy.h
diff --git a/cc/CCProxy.h b/cc/CCProxy.h
index 30a62cc55cc9a41ecfc82a3fcd4a324794cf76db..99967dfe1c8f6af5800ce8077247a0eabda3163f 100644
--- a/cc/CCProxy.h
+++ b/cc/CCProxy.h
@@ -6,6 +6,7 @@
 #define CCProxy_h
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include <public/WebCompositorOutputSurface.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
@@ -83,19 +84,15 @@ public:
     virtual void acquireLayerTextures() = 0;
 
     // Debug hooks
-#ifndef NDEBUG
     static bool isMainThread();
     static bool isImplThread();
     static bool isMainThreadBlocked();
     static void setMainThreadBlocked(bool);
-#endif
 
     // Testing hooks
     virtual void loseContext() = 0;
 
-#ifndef NDEBUG
     static void setCurrentThreadIsImplThread(bool);
-#endif
 
 protected:
     CCProxy();
@@ -110,17 +107,13 @@ class DebugScopedSetMainThreadBlocked {
 public:
     DebugScopedSetMainThreadBlocked()
     {
-#if !ASSERT_DISABLED
-        ASSERT(!CCProxy::isMainThreadBlocked());
+        DCHECK(!CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(true);
-#endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
-#if !ASSERT_DISABLED
-        ASSERT(CCProxy::isMainThreadBlocked());
+        DCHECK(CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(false);
-#endif
     }
 };