Various logging-related cleanups & reformatting.

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>
@@ skipping 20 matching lines @@
 #define ASSERT_DCHECK_DEATH(statement) ASSERT_DEATH(statement, "Check failed")
 
 #else
 // DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
 
 // Macro copied from gtest-death-test-internal.h as it's (1) internal for now
 // and (2) only defined if !GTEST_HAS_DEATH_TEST which is only a subset of the
 // conditions in which it's needed here.
 // TODO(gab): Expose macro in upstream gtest repo for consumers like us that
 // want more specific death tests and remove this hack.
-# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::AlwaysTrue()) { \
-      GTEST_LOG_(WARNING) \
-          << "Death tests are not supported on this platform.\n" \
-          << "Statement '" #statement "' cannot be verified."; \
-    } else if (::testing::internal::AlwaysFalse()) { \
-      ::testing::internal::RE::PartialMatch(".*", (regex)); \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-      terminator; \
-    } else \
-      ::testing::Message()
+#define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator)  \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                     \
+  if (::testing::internal::AlwaysTrue()) {                          \
+    GTEST_LOG_(WARNING)                                             \
+        << "Death tests are not supported in this configuration.\n" \
+        << "Statement '" #statement "' cannot be verified.";        \
+  } else if (::testing::internal::AlwaysFalse()) {                  \
+    ::testing::internal::RE::PartialMatch(".*", (regex));           \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);      \
+    terminator;                                                     \
+  } else                                                            \
+    ::testing::Message()
 
 #define EXPECT_DCHECK_DEATH(statement) \
     GTEST_UNSUPPORTED_DEATH_TEST(statement, "Check failed", )
 #define ASSERT_DCHECK_DEATH(statement) \
     GTEST_UNSUPPORTED_DEATH_TEST(statement, "Check failed", return)
 
 #endif
 // DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
 
 namespace base {
@@ skipping 30 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_