Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3823)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/metrics/sample_map_unittest.cc

Issue 2163023002: Unify usage of logging/assert macros in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/logging.h ('K') | « base/metrics/persistent_sample_map_unittest.cc ('k') | base/sequence_checker_unittest.cc » ('j') | base/task/cancelable_task_tracker_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/sample_map_unittest.cc
diff --git a/base/metrics/sample_map_unittest.cc b/base/metrics/sample_map_unittest.cc
index 8f577109cdcdc776fb4a7ffd37add8f0edbb055c..9bfb7df978f0094358da822d4aec869c889e6af9 100644
--- a/base/metrics/sample_map_unittest.cc
+++ b/base/metrics/sample_map_unittest.cc
@@ -144,7 +144,7 @@ TEST(SampleMapIteratorTest, SkipEmptyRanges) {
EXPECT_TRUE(it->Done());
}
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+#if DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
TEST(SampleMapIteratorDeathTest, IterateDoneTest) {
SampleMap samples(1);
@@ -166,7 +166,7 @@ TEST(SampleMapIteratorDeathTest, IterateDoneTest) {
}
#endif
-// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+// DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
} // namespace
} // namespace base
« base/logging.h ('K') | « base/metrics/persistent_sample_map_unittest.cc ('k') | base/sequence_checker_unittest.cc » ('j') | base/task/cancelable_task_tracker_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698