Index: base/logging_unittest.cc |
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc |
index 7b98e0fcdb0f26846d8a6d1c84e15e40bc7d9cc9..d03ed931853ef7fe96e2cdf8d5e67794d82c9989 100644 |
--- a/base/logging_unittest.cc |
+++ b/base/logging_unittest.cc |
@@ -204,42 +204,42 @@ TEST_F(LoggingTest, DebugLoggingReleaseBehavior) { |
TEST_F(LoggingTest, DcheckStreamsAreLazy) { |
MockLogSource mock_log_source; |
EXPECT_CALL(mock_log_source, Log()).Times(0); |
- if (DCHECK_IS_ON()) { |
- DCHECK(true) << mock_log_source.Log(); |
- DCHECK_EQ(0, 0) << mock_log_source.Log(); |
- } else { |
- DCHECK(mock_log_source.Log()) << mock_log_source.Log(); |
- DPCHECK(mock_log_source.Log()) << mock_log_source.Log(); |
- DCHECK_EQ(0, 0) << mock_log_source.Log(); |
- DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL)) |
- << mock_log_source.Log(); |
- } |
+#if DCHECK_IS_ON |
+ DCHECK(true) << mock_log_source.Log(); |
+ DCHECK_EQ(0, 0) << mock_log_source.Log(); |
+#else |
+ DCHECK(mock_log_source.Log()) << mock_log_source.Log(); |
+ DPCHECK(mock_log_source.Log()) << mock_log_source.Log(); |
+ DCHECK_EQ(0, 0) << mock_log_source.Log(); |
+ DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL)) |
+ << mock_log_source.Log(); |
+#endif |
} |
TEST_F(LoggingTest, Dcheck) { |
#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) |
// Release build. |
- EXPECT_FALSE(DCHECK_IS_ON()); |
+ EXPECT_FALSE(DCHECK_IS_ON); |
EXPECT_FALSE(DLOG_IS_ON(DCHECK)); |
#elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |
// Release build with real DCHECKS. |
SetLogAssertHandler(&LogSink); |
- EXPECT_TRUE(DCHECK_IS_ON()); |
+ EXPECT_TRUE(DCHECK_IS_ON); |
EXPECT_FALSE(DLOG_IS_ON(DCHECK)); |
#else |
// Debug build. |
SetLogAssertHandler(&LogSink); |
- EXPECT_TRUE(DCHECK_IS_ON()); |
+ EXPECT_TRUE(DCHECK_IS_ON); |
EXPECT_TRUE(DLOG_IS_ON(DCHECK)); |
#endif |
EXPECT_EQ(0, log_sink_call_count); |
DCHECK(false); |
- EXPECT_EQ(DCHECK_IS_ON() ? 1 : 0, log_sink_call_count); |
+ EXPECT_EQ(DCHECK_IS_ON ? 1 : 0, log_sink_call_count); |
DPCHECK(false); |
- EXPECT_EQ(DCHECK_IS_ON() ? 2 : 0, log_sink_call_count); |
+ EXPECT_EQ(DCHECK_IS_ON ? 2 : 0, log_sink_call_count); |
DCHECK_EQ(0, 1); |
- EXPECT_EQ(DCHECK_IS_ON() ? 3 : 0, log_sink_call_count); |
+ EXPECT_EQ(DCHECK_IS_ON ? 3 : 0, log_sink_call_count); |
} |
TEST_F(LoggingTest, DcheckReleaseBehavior) { |