Unify usage of logging/assert macros in base/

base/sequence_checker_unittest.cc

Index: base/sequence_checker_unittest.cc
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc
index 469605fb9d769d65e1e5da5c4380a5a8d4fadc08..0d10396512c814a1b4ec01d9a9a387cfebd75844 100644
--- a/base/sequence_checker_unittest.cc
+++ b/base/sequence_checker_unittest.cc
@@ -21,14 +21,6 @@
 #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))
-#define ENABLE_SEQUENCE_CHECKER 1
-#else
-#define ENABLE_SEQUENCE_CHECKER 0
-#endif
-
 namespace base {
 
 namespace {
@@ -193,7 +185,7 @@ void SequenceCheckerTest::MethodOnDifferentThreadDeathTest() {
   other_thread()->Stop();
 }
 
-#if ENABLE_SEQUENCE_CHECKER
+#if DCHECK_IS_ON()
 TEST_F(SequenceCheckerTest, MethodNotAllowedOnDifferentThreadDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -203,7 +195,7 @@ TEST_F(SequenceCheckerTest, MethodNotAllowedOnDifferentThreadDeathTestInDebug) {
 TEST_F(SequenceCheckerTest, MethodAllowedOnDifferentThreadDeathTestInRelease) {
   MethodOnDifferentThreadDeathTest();
 }
-#endif  // ENABLE_SEQUENCE_CHECKER
+#endif  // DCHECK_IS_ON()
 
 void SequenceCheckerTest::DetachThenCallFromDifferentThreadDeathTest() {
   std::unique_ptr<SequenceCheckedObject> sequence_checked_object(
@@ -220,7 +212,7 @@ void SequenceCheckerTest::DetachThenCallFromDifferentThreadDeathTest() {
   sequence_checked_object->DoStuff();
 }
 
-#if ENABLE_SEQUENCE_CHECKER
+#if DCHECK_IS_ON()
 TEST_F(SequenceCheckerTest, DetachFromSequenceDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -230,7 +222,7 @@ TEST_F(SequenceCheckerTest, DetachFromSequenceDeathTestInDebug) {
 TEST_F(SequenceCheckerTest, DetachFromThreadDeathTestInRelease) {
   DetachThenCallFromDifferentThreadDeathTest();
 }
-#endif  // ENABLE_SEQUENCE_CHECKER
+#endif  // DCHECK_IS_ON()
 
 void SequenceCheckerTest::DifferentSequenceTokensDeathTest() {
   std::unique_ptr<SequenceCheckedObject> sequence_checked_object(
@@ -247,7 +239,7 @@ void SequenceCheckerTest::DifferentSequenceTokensDeathTest() {
   other_thread()->Stop();
 }
 
-#if ENABLE_SEQUENCE_CHECKER
+#if DCHECK_IS_ON()
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -257,7 +249,7 @@ TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInDebug) {
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInRelease) {
   DifferentSequenceTokensDeathTest();
 }
-#endif  // ENABLE_SEQUENCE_CHECKER
+#endif  // DCHECK_IS_ON()
 
 void SequenceCheckerTest::WorkerPoolAndSimpleThreadDeathTest() {
   std::unique_ptr<SequenceCheckedObject> sequence_checked_object(
@@ -272,7 +264,7 @@ void SequenceCheckerTest::WorkerPoolAndSimpleThreadDeathTest() {
   other_thread()->Stop();
 }
 
-#if ENABLE_SEQUENCE_CHECKER
+#if DCHECK_IS_ON()
 TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -282,7 +274,7 @@ TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInDebug) {
 TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInRelease) {
   WorkerPoolAndSimpleThreadDeathTest();
 }
-#endif  // ENABLE_SEQUENCE_CHECKER
+#endif  // DCHECK_IS_ON()
 
 void SequenceCheckerTest::TwoDifferentWorkerPoolsDeathTest() {
   std::unique_ptr<SequenceCheckedObject> sequence_checked_object(
@@ -302,7 +294,7 @@ void SequenceCheckerTest::TwoDifferentWorkerPoolsDeathTest() {
   second_pool_owner.pool()->FlushForTesting();
 }
 
-#if ENABLE_SEQUENCE_CHECKER
+#if DCHECK_IS_ON()
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -312,11 +304,8 @@ TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInDebug) {
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInRelease) {
   TwoDifferentWorkerPoolsDeathTest();
 }
-#endif  // ENABLE_SEQUENCE_CHECKER
+#endif  // DCHECK_IS_ON()
 
 }  // namespace
 
 }  // namespace base
-
-// Just in case we ever get lumped together with other compilation units.
-#undef ENABLE_SEQUENCE_CHECKER