Unify usage of logging/assert macros in base/

base/threading/non_thread_safe.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 BASE_THREADING_NON_THREAD_SAFE_H_
 #define BASE_THREADING_NON_THREAD_SAFE_H_
 
 // Classes deriving from NonThreadSafe may need to suppress MSVC warning 4275:
 // non dll-interface class 'Bar' used as base for dll-interface class 'Foo'.
 // There is a specific macro to do it: NON_EXPORTED_BASE(), defined in
 // compiler_specific.h
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 
 // See comment at top of thread_checker.h
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+#if DCHECK_IS_ON()
 #define ENABLE_NON_THREAD_SAFE 1

[danakj, 2016/07/19 20:17:01]

Same question, why not just DCHECK_IS_ON() instead?

[gab, 2016/07/20 02:43:58]

Done.

 #else
 #define ENABLE_NON_THREAD_SAFE 0
 #endif
 
 #include "base/threading/non_thread_safe_impl.h"
 
 namespace base {
 
 // Do nothing implementation of NonThreadSafe, for release mode.
 //
@@ skipping 35 matching lines @@
 typedef NonThreadSafeImpl NonThreadSafe;
 #else
 typedef NonThreadSafeDoNothing NonThreadSafe;
 #endif  // ENABLE_NON_THREAD_SAFE
 
 #undef ENABLE_NON_THREAD_SAFE
 
 }  // namespace base
 
 #endif  // BASE_THREADING_NON_THREAD_SAFE_H_