diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 21:53:05 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 21:53:05 +0000 |
| commit | bf97033addc8e72499652f64886ef89c7b062c39 (patch) | |
| tree | c20ae214eb4ffe605e0292299e1e93935272e482 /chrome | |
| parent | 8ffd052ba929d94eb587e4d55efc74557cd7454d (diff) | |
| download | chromium_src-bf97033addc8e72499652f64886ef89c7b062c39.zip chromium_src-bf97033addc8e72499652f64886ef89c7b062c39.tar.gz chromium_src-bf97033addc8e72499652f64886ef89c7b062c39.tar.bz2 | |
Revert 70782 - Made logging not look up --enable-dcheck from command line
Made --enable-dcheck a parameter to InitLogging() and fixed up all
callsites.
BUG=62736
TEST=Manual
Review URL: http://codereview.chromium.org/6070006
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/6100007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/tools/sync_listen_notifications.cc | 8 | ||||
| -rw-r--r-- | chrome/common/logging_chrome.cc | 8 | ||||
| -rw-r--r-- | chrome/installer/util/logging_installer.cc | 10 | ||||
| -rw-r--r-- | chrome/tools/crash_service/main.cc | 8 |
4 files changed, 9 insertions, 25 deletions
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 27e3010..0f66c27 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -222,12 +222,8 @@ class ServerNotifierDelegate int main(int argc, char* argv[]) { base::AtExitManager exit_manager; CommandLine::Init(argc, argv); - logging::InitLogging( - NULL, - logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, - logging::LOCK_LOG_FILE, - logging::DELETE_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + logging::InitLogging(NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, + logging::LOCK_LOG_FILE, logging::DELETE_OLD_LOG_FILE); logging::SetMinLogLevel(logging::LOG_INFO); // TODO(akalin): Make sure that all log messages are printed to the // console, even on Windows (SetMinLogLevel isn't enough). diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index f8418ac..c607f21 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -262,16 +262,10 @@ void InitChromeLogging(const CommandLine& command_line, delete_old_log_file = logging::APPEND_TO_OLD_LOG_FILE; #endif - 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; - bool success = InitLogging(log_path.value().c_str(), DetermineLogMode(command_line), logging::LOCK_LOG_FILE, - delete_old_log_file, - dcheck_state); + delete_old_log_file); #if defined(OS_CHROMEOS) if (!success) { diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc index 73e1719..d91ca70 100644 --- a/chrome/installer/util/logging_installer.cc +++ b/chrome/installer/util/logging_installer.cc @@ -38,12 +38,10 @@ void InitInstallerLogging(const installer::MasterPreferences& prefs) { return; } - logging::InitLogging( - GetLogFilePath(prefs).value().c_str(), - logging::LOG_ONLY_TO_FILE, - logging::LOCK_LOG_FILE, - logging::DELETE_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + logging::InitLogging(GetLogFilePath(prefs).value().c_str(), + logging::LOG_ONLY_TO_FILE, + logging::LOCK_LOG_FILE, + logging::DELETE_OLD_LOG_FILE); if (prefs.GetBool(installer::master_preferences::kVerboseLogging, &value) && value) { diff --git a/chrome/tools/crash_service/main.cc b/chrome/tools/crash_service/main.cc index b9cabec6..4a8e56a 100644 --- a/chrome/tools/crash_service/main.cc +++ b/chrome/tools/crash_service/main.cc @@ -45,12 +45,8 @@ int __stdcall wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd_line, FilePath log_file = operating_dir.Append(kStandardLogFile); // Logging to a file with pid, tid and timestamp. - logging::InitLogging( - log_file.value().c_str(), - logging::LOG_ONLY_TO_FILE, - logging::LOCK_LOG_FILE, - logging::APPEND_TO_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + logging::InitLogging(log_file.value().c_str(), logging::LOG_ONLY_TO_FILE, + logging::LOCK_LOG_FILE, logging::APPEND_TO_OLD_LOG_FILE); logging::SetLogItems(true, true, true, false); VLOG(1) << "session start. cmdline is [" << cmd_line << "]"; |