Unify usage of logging/assert macros in base/

base/test/gtest_util.h

Index: base/test/gtest_util.h
diff --git a/base/test/gtest_util.h b/base/test/gtest_util.h
index c39657cf7b532738a59850ea5f464ad2b46c1ce5..7753dd2e22260193f3dcf49301d38d3ae3ecff3d 100644
--- a/base/test/gtest_util.h
+++ b/base/test/gtest_util.h
@@ -18,14 +18,17 @@
 // when the death is expected to be caused by a DCHECK. Contrary to
 // EXPECT/ASSERT_DEBUG_DEATH however, it doesn't execute the statement in non-
 // dcheck builds as DCHECKs are intended to catch things that should never
-// happen and as such executing the statement results in undefined behavior.
+// happen and as such executing the statement results in undefined behavior
+// (|statement| is compiled in unsupported configurations nonetheless).
 // Death tests misbehave on Android.
 #if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
 #define EXPECT_DCHECK_DEATH(statement, regex) EXPECT_DEATH(statement, regex)
 #define ASSERT_DCHECK_DEATH(statement, regex) ASSERT_DEATH(statement, regex)
 #else
-#define EXPECT_DCHECK_DEATH(statement, regex)
-#define ASSERT_DCHECK_DEATH(statement, regex)
+#define EXPECT_DCHECK_DEATH(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
+#define ASSERT_DCHECK_DEATH(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
 #endif
 
 namespace base {