Index: chrome/common/logging_chrome.cc |
=================================================================== |
--- chrome/common/logging_chrome.cc (revision 97896) |
+++ chrome/common/logging_chrome.cc (working copy) |
@@ -243,10 +243,15 @@ |
// Always force a new symlink when redirecting. |
FilePath target_path = SetUpSymlinkIfNeeded(log_path, true); |
+#if defined(DCHECK_ALWAYS_ON) |
logging::DcheckState dcheck_state = |
+ logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS |
+#else |
+ logging::DcheckState dcheck_state = |
command_line.HasSwitch(switches::kEnableDCHECK) ? |
logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS : |
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; |
+#endif |
// ChromeOS always logs through the symlink, so it shouldn't be |
// deleted if it already exists. |
@@ -304,10 +309,15 @@ |
#endif |
} |
+#if defined(DCHECK_ALWAYS_ON) |
logging::DcheckState dcheck_state = |
+ logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS |
+#else |
+ logging::DcheckState dcheck_state = |
command_line.HasSwitch(switches::kEnableDCHECK) ? |
logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS : |
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; |
+#endif |
bool success = InitLogging(log_path.value().c_str(), |
logging_dest, |