Revert "cc: Switch to Chromium DCHECKs LOGs"

cc/proxy.h

 // Copyright 2011 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.
 
 #ifndef CCProxy_h
 #define CCProxy_h
 
 #include "base/basictypes.h"
-#include "cc/dcheck.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace cc {
 
 class CCThread;
 class IntRect;
 class IntSize;
 struct CCRenderingStats;
 struct RendererCapabilities;
 
@@ skipping 55 matching lines @@
     // Forces 3D commands on all contexts to wait for all previous SwapBuffers to finish before executing in the GPU
     // process.
     virtual void forceSerializeOnSwapBuffers() = 0;
 
     // Maximum number of sub-region texture updates supported for each commit.
     virtual size_t maxPartialTextureUpdates() const = 0;
 
     virtual void acquireLayerTextures() = 0;
 
     // Debug hooks
-#if CC_DCHECK_ENABLED()
+#ifndef NDEBUG
     static bool isMainThread();
     static bool isImplThread();
     static bool isMainThreadBlocked();
     static void setMainThreadBlocked(bool);
 #endif
 
     // Testing hooks
     virtual void loseContext() = 0;
 
-#if CC_DCHECK_ENABLED()
+#ifndef NDEBUG
     static void setCurrentThreadIsImplThread(bool);
 #endif
 
 protected:
     CCProxy();
     friend class DebugScopedSetImplThread;
     friend class DebugScopedSetMainThreadBlocked;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(CCProxy);
 };
 
 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
     }
 };
 
 }
 
 #endif