Let DCHECK in non-official-release build be opt-in with dcheck_always_on=1 only

base/logging_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/logging.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace logging {
 
 namespace {
 
 using ::testing::Return;
 
 // Needs to be global since log assert handlers can't maintain state.
 int log_sink_call_count = 0;
 
-#if !LOGGING_IS_OFFICIAL_BUILD
-void LogSink(const std::string& str) {
-  ++log_sink_call_count;
-}
-#endif  // !LOGGING_IS_OFFICIAL_BUILD
-
 // Class to make sure any manipulations we do to the min log level are
 // contained (i.e., do not affect other unit tests).
 class LogStateSaver {
  public:
   LogStateSaver() : old_min_log_level_(GetMinLogLevel()) {}
 
   ~LogStateSaver() {
     SetMinLogLevel(old_min_log_level_);
     SetLogAssertHandler(NULL);
     SetLogReportHandler(NULL);
     log_sink_call_count = 0;
   }
 
  private:
   int old_min_log_level_;
 
   DISALLOW_COPY_AND_ASSIGN(LogStateSaver);
 };
 
 class LoggingTest : public testing::Test {
+ protected:
+  // Placed here to avoid unused function warning for some build configurations.

[Nico, 2014/03/07 22:58:35]

Can't you change the #if above to defined(DCHECK_ALWAYS_ON) || !defined(NDEBUG)
instead, and keep this where it was?

[Xianzhu, 2014/03/07 23:29:36]

Also needs "!defined(OFFICIAL_BUILD) ||" because the function is also used to
test CHECK() on non-official builds.

Done.

+  static void LogSink(const std::string& str) {
+    ++log_sink_call_count;
+  }
+
  private:
   LogStateSaver log_state_saver_;
 };
 
 class MockLogSource {
  public:
   MOCK_METHOD0(Log, const char*());
 };
 
 TEST_F(LoggingTest, BasicLogging) {
@@ skipping 106 matching lines @@
 
   DLOG(INFO) << mock_log_source.Log();
   DLOG_IF(INFO, true) << mock_log_source.Log();
   DPLOG(INFO) << mock_log_source.Log();
   DPLOG_IF(INFO, true) << mock_log_source.Log();
   DVLOG(1) << mock_log_source.Log();
   DVLOG_IF(1, true) << mock_log_source.Log();
 }
 
 // Official builds have CHECKs directly call BreakDebugger.
-#if !LOGGING_IS_OFFICIAL_BUILD
+#if !defined(OFFICIAL_BUILD)
 
 TEST_F(LoggingTest, CheckStreamsAreLazy) {
   MockLogSource mock_log_source, uncalled_mock_log_source;
   EXPECT_CALL(mock_log_source, Log()).Times(8).
       WillRepeatedly(Return("check message"));
   EXPECT_CALL(uncalled_mock_log_source, Log()).Times(0);
 
   SetLogAssertHandler(&LogSink);
 
   CHECK(mock_log_source.Log()) << uncalled_mock_log_source.Log();
@@ skipping 14 matching lines @@
   // in release mode.
   DLOG_IF(INFO, debug_only_variable) << "test";
   DLOG_ASSERT(debug_only_variable) << "test";
   DPLOG_IF(INFO, debug_only_variable) << "test";
   DVLOG_IF(1, debug_only_variable) << "test";
 }
 
 TEST_F(LoggingTest, DcheckStreamsAreLazy) {
   MockLogSource mock_log_source;
   EXPECT_CALL(mock_log_source, Log()).Times(0);
-#if !LOGGING_IS_OFFICIAL_BUILD && defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-  // Unofficial release build without dcheck enabled.
-  set_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();
-  DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL))
-      << mock_log_source.Log();
-#endif
+  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();
+  }
 }
 
 TEST_F(LoggingTest, Dcheck) {
-#if LOGGING_IS_OFFICIAL_BUILD
-  // Official build.
+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
+  // Release build.
   EXPECT_FALSE(DCHECK_IS_ON());
   EXPECT_FALSE(DLOG_IS_ON(DCHECK));
-#elif defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-  // Unofficial release build.
-  set_dcheck_state(ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
-  SetLogReportHandler(&LogSink);
-  EXPECT_TRUE(DCHECK_IS_ON());
-  EXPECT_FALSE(DLOG_IS_ON(DCHECK));
 #elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
-  // Unofficial release build with real DCHECKS.
-  set_dcheck_state(ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  // Release build with real DCHECKS.
   SetLogAssertHandler(&LogSink);
   EXPECT_TRUE(DCHECK_IS_ON());
   EXPECT_FALSE(DLOG_IS_ON(DCHECK));
 #else
-  // Unofficial debug build.
+  // Debug build.
   SetLogAssertHandler(&LogSink);
   EXPECT_TRUE(DCHECK_IS_ON());
   EXPECT_TRUE(DLOG_IS_ON(DCHECK));
-#endif  // defined(LOGGING_IS_OFFICIAL_BUILD)
+#endif
 
   EXPECT_EQ(0, log_sink_call_count);
   DCHECK(false);
   EXPECT_EQ(DCHECK_IS_ON() ? 1 : 0, log_sink_call_count);
   DPCHECK(false);
   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);
 }
 
 TEST_F(LoggingTest, DcheckReleaseBehavior) {
   int some_variable = 1;
   // These should still reference |some_variable| so we don't get
   // unused variable warnings.
   DCHECK(some_variable) << "test";
   DPCHECK(some_variable) << "test";
   DCHECK_EQ(some_variable, 1) << "test";
 }
 
 }  // namespace
 
 }  // namespace logging