Unify usage of logging/assert macros in base/

base/task/cancelable_task_tracker_unittest.cc

 // Copyright 2014 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/task/cancelable_task_tracker.h"
 
 #include <cstddef>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 326 matching lines @@
 // debug mode.
 
 class CancelableTaskTrackerDeathTest : public CancelableTaskTrackerTest {
  protected:
   CancelableTaskTrackerDeathTest() {
     // The default style "fast" does not support multi-threaded tests.
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   }
 };
 
-// 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
 }
 
 void PostDoNothingTask(CancelableTaskTracker* task_tracker) {
   ignore_result(task_tracker->PostTask(
       scoped_refptr<TestSimpleTaskRunner>(new TestSimpleTaskRunner()).get(),
       FROM_HERE,
       Bind(&DoNothing)));
 }
@@ skipping 43 matching lines @@
 
   bad_thread.task_runner()->PostTask(
       FROM_HERE,
       Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, Unretained(&task_tracker_),
            Bind(&CancelableTaskTracker::TryCancelAll)));
 
   test_task_runner->RunUntilIdle();
 }
 
 }  // namespace base