base: Enable lock dchecks with dchecks_always_on

base/synchronization/condition_variable_win.cc

 // Copyright (c) 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.
 
 #include "base/synchronization/condition_variable.h"
 
 #include <windows.h>
 #include <stack>
 
 #include "base/compiler_specific.h"
@@ skipping 81 matching lines @@
 
 void WinVistaCondVar::Wait() {
   TimedWait(TimeDelta::FromMilliseconds(INFINITE));
 }
 
 void WinVistaCondVar::TimedWait(const TimeDelta& max_time) {
   base::ThreadRestrictions::AssertWaitAllowed();
   DWORD timeout = static_cast<DWORD>(max_time.InMilliseconds());
   CRITICAL_SECTION* cs = user_lock_.lock_.native_handle();
 
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   user_lock_.CheckHeldAndUnmark();
 #endif
 
   if (FALSE == sleep_condition_variable_fn(&cv_, cs, timeout)) {
     DCHECK(GetLastError() != WAIT_TIMEOUT);
   }
 
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   user_lock_.CheckUnheldAndMark();
 #endif
 }
 
 void WinVistaCondVar::Broadcast() {
   wake_all_condition_variable_fn(&cv_);
 }
 
 void WinVistaCondVar::Signal() {
   wake_condition_variable_fn(&cv_);
@@ skipping 539 matching lines @@
 
 void ConditionVariable::Broadcast() {
   impl_->Broadcast();
 }
 
 void ConditionVariable::Signal() {
   impl_->Signal();
 }
 
 }  // namespace base