| Index: base/logging.cc
|
| diff --git a/base/logging.cc b/base/logging.cc
|
| index cfb1065e41a35cb045140060940621dff6b31da6..bdce7b32edf1769416d846c86de5d1183ff7db00 100644
|
| --- a/base/logging.cc
|
| +++ b/base/logging.cc
|
| @@ -64,7 +64,7 @@ typedef pthread_mutex_t* MutexHandle;
|
|
|
| namespace logging {
|
|
|
| -bool g_enable_dcheck = false;
|
| +DcheckState g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
|
| VlogInfo* g_vlog_info = NULL;
|
|
|
| const char* const log_severity_names[LOG_NUM_SEVERITIES] = {
|
| @@ -353,10 +353,10 @@ bool InitializeLogFileHandle() {
|
| bool BaseInitLoggingImpl(const PathChar* new_log_file,
|
| LoggingDestination logging_dest,
|
| LogLockingState lock_log,
|
| - OldFileDeletionState delete_old) {
|
| + OldFileDeletionState delete_old,
|
| + DcheckState dcheck_state) {
|
| CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| - g_enable_dcheck =
|
| - command_line->HasSwitch(switches::kEnableDCHECK);
|
| + g_dcheck_state = dcheck_state;
|
| delete g_vlog_info;
|
| g_vlog_info = NULL;
|
| // Don't bother initializing g_vlog_info unless we use one of the
|
|
|