Unify usage of logging/assert macros in base/

base/sequence_checker_unittest.cc

 // Copyright 2013 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/sequence_checker.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Duplicated from base/sequence_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_SEQUENCE_CHECKER 1
 #else
 #define ENABLE_SEQUENCE_CHECKER 0
 #endif
 
 namespace base {
 
 namespace {
 
 const size_t kNumWorkerThreads = 3;
@@ skipping 290 matching lines @@
 #endif  // ENABLE_SEQUENCE_CHECKER
 
 #endif  // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
 
 }  // namespace
 
 }  // namespace base
 
 // Just in case we ever get lumped together with other compilation units.
 #undef ENABLE_SEQUENCE_CHECKER