cc: Switch to Chromium DCHECKs and LOGs

cc/CCCompletionEvent.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 CCCompletionEvent_h
 #define CCCompletionEvent_h
 
+#include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 
 namespace cc {
 
 // Used for making blocking calls from one thread to another. Use only when
 // absolutely certain that doing-so will not lead to a deadlock.
 //
 // It is safe to destroy this object as soon as wait() returns.
 class CCCompletionEvent {
 public:
     CCCompletionEvent()
         : m_event(false /* manual_reset */, false /* initially_signaled */)
     {
-#ifndef NDEBUG
         m_waited = false;
         m_signaled = false;
-#endif
     }
 
     ~CCCompletionEvent()
     {
-        ASSERT(m_waited);
-        ASSERT(m_signaled);
+        DCHECK(m_waited);
+        DCHECK(m_signaled);
     }
 
     void wait()
     {
-        ASSERT(!m_waited);
-#ifndef NDEBUG
+        DCHECK(!m_waited);
         m_waited = true;
-#endif
         m_event.Wait();
     }
 
     void signal()
     {
-        ASSERT(!m_signaled);
-#ifndef NDEBUG
+        DCHECK(!m_signaled);
         m_signaled = true;
-#endif
         m_event.Signal();
     }
 
 private:
     base::WaitableEvent m_event;
-#ifndef NDEBUG

[slavi, 2012/10/12 22:10:13]

Maybe change all the #ifndef NDEBUG to #if ENABLE_DCHECK instead of removing
them?

On the other hand this class should probably be removed altogether and just use
base::WaitableEvent instead.

But the point still stands for all the other removed #ifndef NDEBUG in this CL.

[danakj, 2012/10/12 22:13:20]

ENABLE_DCHECK only exists inside base/logging.h There is currently no
compile-time check to see if DCHECK is on, because there is --enable-dcheck
command line flag.

I am going to propose we remove that. And I think in the meantime I will make a
#define SOMETHING 1 and guard these on that. So that we can replace that guard
with DCHECKS_ALWAYS_ON or something alike it in the future.

     // Used to assert that wait() and signal() are each called exactly once.
     bool m_waited;
     bool m_signaled;
-#endif
 };
 
 }
 
 #endif