Fix LoggingTest.Dcheck in release DCHECK_ALWAYS_ON builds.

mojo/public/cpp/environment/tests/logging_unittest.cc

 // 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.
 
 #include <stdlib.h>
 
 #include <sstream>
 #include <string>
 
 #include "mojo/public/cpp/environment/environment.h"
@@ skipping 433 matching lines @@
   MOJO_DCHECK(true) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
   // |MOJO_DCHECK()| should compile (but not evaluate) its condition even for
   // non-debug builds. (Hopefully, we'll get an unused variable error if it
   // 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
   EXPECT_TRUE(was_called);
   EXPECT_TRUE(log_message_was_called());
   EXPECT_EQ(MOJO_LOG_LEVEL_FATAL, last_log_level());
   // Different compilers have different ideas about the line number of a split
   // line.
   int line = __LINE__;
   EXPECT_EQ(
       ExpectedLogMessage(line - 10,
                          "Check failed: DcheckTestHelper(&was_called). hello"),
       last_message());
 #endif
 
   ResetMockLogger();
 
   // Also try to make sure that we parenthesize the condition properly.
   bool x = true;
   MOJO_DCHECK(false || x) << "hello";
   EXPECT_FALSE(log_message_was_called());
 }
 
 }  // namespace
 }  // namespace mojo