Index: base/logging_unittest.cc |
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc |
index 4b7fdbcd46ad5db4cb640b55bbb96e25c2aa32bb..bb6e3d19e0cab3bfcf98e331db0fe194fb4aadac 100644 |
--- a/base/logging_unittest.cc |
+++ b/base/logging_unittest.cc |
@@ -197,7 +197,7 @@ TEST_F(LoggingTest, DcheckStreamsAreLazy) { |
#if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) |
// Unofficial release build. |
- logging::g_enable_dcheck = false; |
+ g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; |
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(); |
@@ -213,13 +213,13 @@ TEST_F(LoggingTest, Dcheck) { |
EXPECT_FALSE(DLOG_IS_ON(DCHECK)); |
#elif defined(NDEBUG) |
// Unofficial release build. |
- logging::g_enable_dcheck = true; |
- logging::SetLogReportHandler(&LogSink); |
+ g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; |
+ SetLogReportHandler(&LogSink); |
EXPECT_TRUE(DCHECK_IS_ON()); |
EXPECT_FALSE(DLOG_IS_ON(DCHECK)); |
#else |
// Unofficial debug build. |
- logging::SetLogAssertHandler(&LogSink); |
+ SetLogAssertHandler(&LogSink); |
EXPECT_TRUE(DCHECK_IS_ON()); |
EXPECT_TRUE(DLOG_IS_ON(DCHECK)); |
#endif // defined(LOGGING_IS_OFFICIAL_BUILD) |