Ensure that DLOG(FATAL) also asserts in release-with-asserts builds.

ppapi/utility/completion_callback_factory_thread_traits.h

 // Copyright (c) 2012 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 PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_
 #define PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_
 
 #include <stdint.h>
 
 #include "ppapi/cpp/logging.h"
@@ skipping 67 matching lines @@
  public:
   /// A simple reference counter that is not thread-safe.
   ///
   /// <strong>Note:</strong> in Debug mode, it checks that it is either called
   /// on the main thread, or always called on another thread.
   class RefCount {
    public:
     /// Default constructor. In debug mode, this checks that the object is being
     /// created on the main thread.
     RefCount() : ref_(0) {
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
       is_main_thread_ = Module::Get()->core()->IsMainThread();
 #endif
     }
 
     /// Destructor.
     ~RefCount() {
       PP_DCHECK(is_main_thread_ == Module::Get()->core()->IsMainThread());
     }
 
     /// AddRef() increments the reference counter.
     ///
     /// @return An int32_t with the incremented reference counter.
     int32_t AddRef() {
       PP_DCHECK(is_main_thread_ == Module::Get()->core()->IsMainThread());
       return ++ref_;
     }
 
     /// Release() decrements the reference counter.
     ///
     /// @return An int32_t with the decremeneted reference counter.
     int32_t Release() {
       PP_DCHECK(is_main_thread_ == Module::Get()->core()->IsMainThread());
       return --ref_;
     }
 
    private:
     int32_t ref_;
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
     bool is_main_thread_;
 #endif
   };
 
   /// A simple object that acts like a lock but does nothing.
   ///
   /// <strong>Note:</strong> in Debug mode, it checks that it is either
   /// called on the main thread, or always called on another thread. It also
   /// asserts that the caller does not recursively lock.
   class Lock {
    public:
     Lock() {
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
       is_main_thread_ = Module::Get()->core()->IsMainThread();
       lock_held_ = false;
 #endif
     }
 
     ~Lock() {
       PP_DCHECK(is_main_thread_ == Module::Get()->core()->IsMainThread());
     }
 
     /// Acquires the fake "lock". This does nothing except perform checks in
     /// debug mode.
     void Acquire() {
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
       PP_DCHECK(!lock_held_);
       lock_held_ = true;
 #endif
     }
 
     /// Releases the fake "lock". This does nothing except perform checks in
     /// debug mode.
     void Release() {
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
       PP_DCHECK(lock_held_);
       lock_held_ = false;
 #endif
     }
 
    private:
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
     bool is_main_thread_;
     bool lock_held_;
 #endif
   };
 
   class AutoLock {
    public:
     explicit AutoLock(Lock& lock) : lock_(lock) {
       lock_.Acquire();
     }
     ~AutoLock() {
       lock_.Release();
     }
 
    private:
     Lock& lock_;
   };
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_