Unify usage of logging/assert macros in base/

base/task/cancelable_task_tracker_unittest.cc

Index: base/task/cancelable_task_tracker_unittest.cc
diff --git a/base/task/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc
index ff9e40b855eaebce8d77f362ed827757f151cb5f..5444038f83cf04a5f6b0512dba0e39046e82bf06 100644
--- a/base/task/cancelable_task_tracker_unittest.cc
+++ b/base/task/cancelable_task_tracker_unittest.cc
@@ -344,21 +344,13 @@ class CancelableTaskTrackerDeathTest : public CancelableTaskTrackerTest {
   }
 };
 
-// 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)
-#define ENABLE_THREAD_CHECKER 1
-#else
-#define ENABLE_THREAD_CHECKER 0
-#endif
-
 // Runs |fn| with |task_tracker|, expecting it to crash in debug mode.
 void MaybeRunDeadlyTaskTrackerMemberFunction(
     CancelableTaskTracker* task_tracker,
     const Callback<void(CancelableTaskTracker*)>& fn) {
 // CancelableTask uses DCHECKs with its ThreadChecker (itself only
 // enabled in debug mode).
-#if ENABLE_THREAD_CHECKER
+#if DCHECK_IS_ON()
   EXPECT_DEATH_IF_SUPPORTED(fn.Run(task_tracker), "");
 #endif
 }