Unify usage of logging/assert macros in base/

base/threading/thread_checker_unittest.cc

 // 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.
 
 #include "base/threading/thread_checker.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/threading/simple_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Duplicated from base/threading/thread_checker.h so that we can be
 // good citizens there and undef the macro.
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#if DCHECK_IS_ON()
 #define ENABLE_THREAD_CHECKER 1

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

and here.. and in the thread_checker.h?
https://cs.chromium.org/chromium/src/base/threading/thread_checker.h?rcl=0&l=16

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

Done.

 #else
 #define ENABLE_THREAD_CHECKER 0
 #endif
 
 namespace base {
 
 namespace {
 
 // Simple class to exercise the basics of ThreadChecker.
 // Both the destructor and DoStuff should verify that they were
@@ skipping 144 matching lines @@
   ThreadCheckerClass::DetachThenCallFromDifferentThreadImpl();
 }
 #endif  // ENABLE_THREAD_CHECKER
 
 #endif  // GTEST_HAS_DEATH_TEST || !ENABLE_THREAD_CHECKER
 
 // Just in case we ever get lumped together with other compilation units.
 #undef ENABLE_THREAD_CHECKER
 
 }  // namespace base