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

chrome/common/logging_chrome.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
@@ skipping 225 matching lines @@
   // Redirect logs to the session log directory, if set.  Otherwise
   // defaults to the profile dir.
   base::FilePath log_path = GetSessionLogFile(command_line);
 
   // Creating symlink causes us to do blocking IO on UI thread.
   // Temporarily allow it until we fix http://crbug.com/61143
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   // Always force a new symlink when redirecting.
   base::FilePath target_path = SetUpSymlinkIfNeeded(log_path, true);
 
-  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;
-
   // ChromeOS always logs through the symlink, so it shouldn't be
   // deleted if it already exists.
   logging::LoggingSettings settings;
   settings.logging_dest = DetermineLogMode(command_line);
   settings.log_file = log_path.value().c_str();
-  settings.dcheck_state = dcheck_state;
   if (!logging::InitLogging(settings)) {
     DLOG(ERROR) << "Unable to initialize logging to " << log_path.value();
     RemoveSymlinkAndLog(log_path, target_path);
   } else {
     chrome_logging_redirected_ = true;
   }
 }
 
 #endif  // OS_CHROMEOS
 
@@ skipping 29 matching lines @@
 
     // Because ChromeOS manages the move to a new session by redirecting
     // the link, it shouldn't remove the old file in the logging code,
     // since that will remove the newly created link instead.
     delete_old_log_file = logging::APPEND_TO_OLD_LOG_FILE;
 #endif
   } else {
     log_locking_state = DONT_LOCK_LOG_FILE;
   }
 
-  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;
-
   logging::LoggingSettings settings;
   settings.logging_dest = logging_dest;
   settings.log_file = log_path.value().c_str();
   settings.lock_log = log_locking_state;
   settings.delete_old = delete_old_log_file;
-  settings.dcheck_state = dcheck_state;
   bool success = logging::InitLogging(settings);
 
 #if defined(OS_CHROMEOS)
   if (!success) {
     DPLOG(ERROR) << "Unable to initialize logging to " << log_path.value()
                 << " (which should be a link to " << target_path.value() << ")";
     RemoveSymlinkAndLog(log_path, target_path);
     chrome_logging_failed_ = true;
     return;
   }
@@ skipping 37 matching lines @@
       DLOG(WARNING) << "Bad log level: " << log_level;
     }
   }
 
 #if defined(OS_WIN)
   // Enable trace control and transport through event tracing for Windows.
   logging::LogEventProvider::Initialize(kChromeTraceProviderName);
 #endif
 
 #ifdef NDEBUG
-  if (command_line.HasSwitch(switches::kSilentDumpOnDCHECK) &&
-      command_line.HasSwitch(switches::kEnableDCHECK)) {
+  if (command_line.HasSwitch(switches::kSilentDumpOnDCHECK) && DCHECK_IS_ON()) {
 #if defined(OS_WIN)
     logging::SetLogReportHandler(DumpProcessAssertHandler);
 #endif
   }
 #endif  // NDEBUG
 
   chrome_logging_initialized_ = true;
 }
 
 // This is a no-op, but we'll keep it around in case
@@ skipping 69 matching lines @@
                                           time_deets.year,
                                           time_deets.month,
                                           time_deets.day_of_month,
                                           time_deets.hour,
                                           time_deets.minute,
                                           time_deets.second);
   return base_path.InsertBeforeExtensionASCII(suffix);
 }
 
 }  // namespace logging