Unify usage of logging/assert macros in base/

base/metrics/persistent_sample_map_unittest.cc

Index: base/metrics/persistent_sample_map_unittest.cc
diff --git a/base/metrics/persistent_sample_map_unittest.cc b/base/metrics/persistent_sample_map_unittest.cc
index beb72e5f20f93d629a2fc55e083165eb55b4a379..9728073ca56032c7f24f4e40dd9e3c789d8c3b9a 100644
--- a/base/metrics/persistent_sample_map_unittest.cc
+++ b/base/metrics/persistent_sample_map_unittest.cc
@@ -234,7 +234,7 @@ TEST(PersistentSampleMapIteratorTest, SkipEmptyRanges) {
 }
 
 // Only run this test on builds that support catching a DCHECK crash.
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+#if DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
 TEST(PersistentSampleMapIteratorDeathTest, IterateDoneTest) {
   std::unique_ptr<PersistentHistogramAllocator> allocator =
       CreateHistogramAllocator(64 << 10);  // 64 KiB
@@ -257,7 +257,7 @@ TEST(PersistentSampleMapIteratorDeathTest, IterateDoneTest) {
   EXPECT_FALSE(it->Done());
 }
 #endif
-// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+// DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
 
 }  // namespace
 }  // namespace base