Unify usage of logging/assert macros in base/

base/test/gtest_util.h

 // Copyright 2014 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.
 
 #ifndef BASE_TEST_GTEST_UTIL_H_
 #define BASE_TEST_GTEST_UTIL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // EXPECT/ASSERT_DCHECK_DEATH is intended to replace EXPECT/ASSERT_DEBUG_DEATH
 // 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 {
 
 class FilePath;
 
 struct TestIdentifier {
   TestIdentifier();
   TestIdentifier(const TestIdentifier& other);
 
@@ skipping 18 matching lines @@
 
 // Reads the list of gtest-based tests from |path| into |output|.
 // Returns true on success.
 bool ReadTestNamesFromFile(
     const FilePath& path,
     std::vector<TestIdentifier>* output) WARN_UNUSED_RESULT;
 
 }  // namespace base
 
 #endif  // BASE_TEST_GTEST_UTIL_H_