Revert of Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere

webrtc/base/criticalsection.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_BASE_CRITICALSECTION_H_
 #define WEBRTC_BASE_CRITICALSECTION_H_
 
 #include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/platform_thread_types.h"
 
 #if defined(WEBRTC_WIN)
 // Include winsock2.h before including <windows.h> to maintain consistency with
 // win32.h.  We can't include win32.h directly here since it pulls in
 // headers such as basictypes.h which causes problems in Chromium where webrtc
 // exists as two separate projects, webrtc and libjingle.
 #include <winsock2.h>
 #include <windows.h>
 #include <sal.h>  // must come after windows headers.
 #endif  // defined(WEBRTC_WIN)
 
 #if defined(WEBRTC_POSIX)
 #include <pthread.h>
 #endif
 
 // See notes in the 'Performance' unit test for the effects of this flag.
 #define USE_NATIVE_MUTEX_ON_MAC 0
 
 #if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
 #include <dispatch/dispatch.h>
 #endif
 
-#define CS_DEBUG_CHECKS RTC_DCHECK_IS_ON
+#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+#define CS_DEBUG_CHECKS 1
+#else
+#define CS_DEBUG_CHECKS 0
+#endif
 
 #if CS_DEBUG_CHECKS
 #define CS_DEBUG_CODE(x) x
 #else  // !CS_DEBUG_CHECKS
 #define CS_DEBUG_CODE(x)
 #endif  // !CS_DEBUG_CHECKS
 
 namespace rtc {
 
 // Locking methods (Enter, TryEnter, Leave)are const to permit protecting
@@ skipping 90 matching lines @@
   explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock);
   ~GlobalLockScope() UNLOCK_FUNCTION();
  private:
   GlobalLockPod* const lock_;
   RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
 };
 
 } // namespace rtc
 
 #endif // WEBRTC_BASE_CRITICALSECTION_H_