Enable DVLOG on non official release build based on the parameter passed for InitLogging.

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"
 
@@ skipping 164 matching lines @@
   SetLogAssertHandler(&LogSink);
 
   CHECK(mock_log_source.Log()) << uncalled_mock_log_source.Log();
   PCHECK(!mock_log_source.Log()) << mock_log_source.Log();
   CHECK_EQ(mock_log_source.Log(), mock_log_source.Log())
       << uncalled_mock_log_source.Log();
   CHECK_NE(mock_log_source.Log(), mock_log_source.Log())
       << mock_log_source.Log();
 }
 
-TEST_F(LoggingTest, DebugLoggingReleaseBehavior) {
-#if !defined(NDEBUG)
-  int debug_only_variable = 1;
+TEST_F(LoggingTest, DebugLoggingOfficialBuildBehavior) {
+#if (!defined(LOGGING_IS_OFFICIAL_BUILD))
+  int non_official_build_only_variable = 1;
 #endif
-  // These should avoid emitting references to |debug_only_variable|
-  // 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";
+  // These should avoid emitting references to
+  // |non_official_build_only_variable| in official build.
+  DLOG_IF(INFO, non_official_build_only_variable) << "test";
+  DLOG_ASSERT(non_official_build_only_variable) << "test";
+  DPLOG_IF(INFO, non_official_build_only_variable) << "test";
+  DVLOG_IF(1, non_official_build_only_variable) << "test";
 }
 
 TEST_F(LoggingTest, DcheckStreamsAreLazy) {
   MockLogSource mock_log_source;
   EXPECT_CALL(mock_log_source, Log()).Times(0);
 #if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) && \
     !defined(DCHECK_ALWAYS_ON)
   // Unofficial release build without dcheck enabled.
   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();
   DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL))
       << mock_log_source.Log();
 #endif
 }
 
+TEST_F(LoggingTest, Dlog) {
+#if defined(LOGGING_IS_OFFICIAL_BUILD)
+  // Official build.
+  EXPECT_FALSE(DLOG_IS_ON(ERROR));
+
+  // Make sure the |undefined_param| is not part of the build.
+  DLOG_IF(ERROR, true) << undefined_param;
+  DPLOG_IF(ERROR, true) << undefined_param;
+  DVLOG_IF(LOG_ERROR, true) << undefined_param;
+  DVPLOG_IF(LOG_ERROR, true) << undefined_param;
+#elif defined(NDEBUG)
+  // Unofficial release build.
+  g_dlog_state = ENABLE_DLOG_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+  MockLogSource mock_log_source, uncalled_mock_log_source;
+
+  // VLOG_* is enabled only if the min log level is negative.
+  SetMinLogLevel(-LOG_ERROR);
+  EXPECT_CALL(mock_log_source, Log()).Times(4).
+      WillRepeatedly(Return("check message"));
+
+  EXPECT_TRUE(DLOG_IS_ON(ERROR));
+
+  DLOG_IF(ERROR, true) << mock_log_source.Log();
+  DPLOG_IF(ERROR, true) << mock_log_source.Log();
+  DVLOG_IF(LOG_ERROR, true) << mock_log_source.Log();
+  DVPLOG_IF(LOG_ERROR, true) << mock_log_source.Log();
+
+  g_dlog_state = DISABLE_DLOG_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+
+  EXPECT_CALL(uncalled_mock_log_source, Log()).Times(0);
+
+  EXPECT_FALSE(DLOG_IS_ON(FATAL));
+
+  DLOG_IF(ERROR, true) << uncalled_mock_log_source.Log();
+  DPLOG_IF(ERROR, true) << uncalled_mock_log_source.Log();
+  DVLOG_IF(LOG_ERROR, true) << uncalled_mock_log_source.Log();
+  DVPLOG_IF(LOG_ERROR, true) << uncalled_mock_log_source.Log();
+
+#else
+  // Debug builds.
+  MockLogSource mock_log_source;
+  SetMinLogLevel(-LOG_ERROR);
+  EXPECT_CALL(mock_log_source, Log()).Times(4).
+      WillRepeatedly(Return("check message"));
+
+  EXPECT_TRUE(DLOG_IS_ON(ERROR));
+
+  DLOG_IF(ERROR, true) << mock_log_source.Log();
+  DPLOG_IF(ERROR, true) << mock_log_source.Log();
+  DVLOG_IF(LOG_ERROR, true) << mock_log_source.Log();
+  DVPLOG_IF(LOG_ERROR, true) << mock_log_source.Log();
+
+#endif  // defined(LOGGING_IS_OFFICIAL_BUILD)
+}
+
+
 TEST_F(LoggingTest, Dcheck) {
 #if defined(LOGGING_IS_OFFICIAL_BUILD)
   // Official build.
   EXPECT_FALSE(DCHECK_IS_ON());
   EXPECT_FALSE(DLOG_IS_ON(DCHECK));
 #elif defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
   // Unofficial release build.
   g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   SetLogReportHandler(&LogSink);
   EXPECT_TRUE(DCHECK_IS_ON());
@@ skipping 25 matching lines @@
   // 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