Unify usage of logging/assert macros in base/

base/metrics/persistent_sample_map_unittest.cc

 // Copyright (c) 2016 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/metrics/persistent_sample_map.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/persistent_histogram_allocator.h"
@@ skipping 216 matching lines @@
   it->Get(&min, &max, &count);
   EXPECT_EQ(15, min);
   EXPECT_EQ(16, max);
   EXPECT_EQ(3, count);
 
   it->Next();
   EXPECT_TRUE(it->Done());
 }
 
 // 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
   HistogramSamples::Metadata meta;
   PersistentSampleMap samples(1, allocator.get(), &meta);
 
   std::unique_ptr<SampleCountIterator> it = samples.Iterator();
 
   EXPECT_TRUE(it->Done());
 
   HistogramBase::Sample min;
   HistogramBase::Sample max;
   HistogramBase::Count count;
   EXPECT_DEATH(it->Get(&min, &max, &count), "");
 
   EXPECT_DEATH(it->Next(), "");
 
   samples.Accumulate(1, 100);
   it = samples.Iterator();
   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