Unify usage of logging/assert macros in base/

base/bind_unittest.cc

Index: base/bind_unittest.cc
diff --git a/base/bind_unittest.cc b/base/bind_unittest.cc
index 5a7ce38627a44d3d5e225e95fc7b9191ce8e259b..b098bf70d463ef42bb0b4c4530d1ee915b5eece8 100644
--- a/base/bind_unittest.cc
+++ b/base/bind_unittest.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
@@ -1065,7 +1066,7 @@ TEST_F(BindTest, WindowsCallingConventions) {
 }
 #endif
 
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
+#if DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
 
 // Test null callbacks cause a DCHECK.
 TEST(BindDeathTest, NullCallback) {
@@ -1074,8 +1075,7 @@ TEST(BindDeathTest, NullCallback) {
   EXPECT_DEATH(base::Bind(null_cb, 42), "");
 }
 
-#endif  // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) &&
-        //     GTEST_HAS_DEATH_TEST
+#endif  // DCHECK_IS_ON() && GTEST_HAS_DEATH_TEST
 
 }  // namespace
 }  // namespace base