Add dvlog_always_on to enable DVLOG without DEBUG and DCHECK option

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/logging.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
@@ skipping 65 matching lines @@
 class MockLogAssertHandler {
  public:
   MOCK_METHOD4(
       HandleLogAssert,
       void(const char*, int, const base::StringPiece, const base::StringPiece));
 };
 
 TEST_F(LoggingTest, BasicLogging) {
   MockLogSource mock_log_source;
   EXPECT_CALL(mock_log_source, Log())
-      .Times(DCHECK_IS_ON() ? 16 : 8)
+      .Times(DCHECK_IS_ON() || DVLOG_IS_ON() ? 16 : 8)
       .WillRepeatedly(Return("log message"));
 
   SetMinLogLevel(LOG_INFO);
 
   EXPECT_TRUE(LOG_IS_ON(INFO));
   EXPECT_TRUE((DCHECK_IS_ON() != 0) == DLOG_IS_ON(INFO));
   EXPECT_TRUE(VLOG_IS_ON(0));
 
   LOG(INFO) << mock_log_source.Log();
   LOG_IF(INFO, true) << mock_log_source.Log();
@@ skipping 267 matching lines @@
   ASSERT_NE(0u, child_crash_addr_1);
   ASSERT_NE(0u, child_crash_addr_2);
   ASSERT_NE(0u, child_crash_addr_3);
   ASSERT_NE(child_crash_addr_1, child_crash_addr_2);
   ASSERT_NE(child_crash_addr_1, child_crash_addr_3);
   ASSERT_NE(child_crash_addr_2, child_crash_addr_3);
 }
 #endif  // OS_POSIX
 
 TEST_F(LoggingTest, DebugLoggingReleaseBehavior) {
-#if DCHECK_IS_ON()
+#if DCHECK_IS_ON() || DVLOG_IS_ON()
   int debug_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";
 }
 
 TEST_F(LoggingTest, DcheckStreamsAreLazy) {
   MockLogSource mock_log_source;
   EXPECT_CALL(mock_log_source, Log()).Times(0);
-#if DCHECK_IS_ON()
+#if DCHECK_IS_ON() || DVLOG_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();
 #endif
 }
@@ skipping 73 matching lines @@
   DCHECK_EQ(mp1, &MemberFunctions::MemberFunction1);
   EXPECT_EQ(0, g_log_sink_call_count);
   DCHECK_EQ(mp2, &MemberFunctions::MemberFunction2);
   EXPECT_EQ(0, g_log_sink_call_count);
   DCHECK_EQ(fp1, fp2);
   EXPECT_EQ(DCHECK_IS_ON() ? 1 : 0, g_log_sink_call_count);
   DCHECK_EQ(mp2, &MemberFunctions::MemberFunction1);
   EXPECT_EQ(DCHECK_IS_ON() ? 2 : 0, g_log_sink_call_count);
 }
 
+TEST_F(LoggingTest, Dvlog) {
+#if defined(NDEBUG) && !defined(DVLOG_ALWAYS_ON)
+  // Release build.
+  EXPECT_FALSE(DVLOG_IS_ON());
+#elif defined(NDEBUG) && defined(DVLOG_ALWAYS_ON)
+  // Release build with real DVLOGs
+  EXPECT_TRUE(DVLOG_IS_ON());
+#else
+  // Debug build.
+  EXPECT_TRUE(DVLOG_IS_ON());
+#endif
+}
+
 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";
 }
 
 TEST_F(LoggingTest, DCheckEqStatements) {
@@ skipping 72 matching lines @@
     std::wstring wstr = L"Hello World";
     std::ostringstream ostr;
     ostr << wstr;
     EXPECT_EQ("Hello World", ostr.str());
   }
 }  // namespace nested_test
 
 }  // namespace
 
 }  // namespace logging