| Index: mojo/public/cpp/environment/tests/logging_unittest.cc
|
| diff --git a/mojo/public/cpp/environment/tests/logging_unittest.cc b/mojo/public/cpp/environment/tests/logging_unittest.cc
|
| index 53a1f8850416757335535719507d47d8b0c3af86..7ecc8b2080a6ef099d2599d77e628c7daa747e31 100644
|
| --- a/mojo/public/cpp/environment/tests/logging_unittest.cc
|
| +++ b/mojo/public/cpp/environment/tests/logging_unittest.cc
|
| @@ -451,7 +451,7 @@ TEST_F(LoggingTest, Dcheck) {
|
| // fails to compile the condition.)
|
| bool was_called = false;
|
| MOJO_DCHECK(DcheckTestHelper(&was_called)) << "hello";
|
| -#ifdef NDEBUG
|
| +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
|
| EXPECT_FALSE(was_called);
|
| EXPECT_FALSE(log_message_was_called());
|
| #else
|
|
|