summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 19:59:52 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 19:59:52 +0000
commit941635a75dae04279729e9f6ca6d553c912da3d6 (patch)
tree2d79a154c35bc9bc31693a7017a8591cf524dcb5 /webkit
parentddcbb213c0fd94f07428c14fd29513b13b9fe1f9 (diff)
downloadchromium_src-941635a75dae04279729e9f6ca6d553c912da3d6.zip
chromium_src-941635a75dae04279729e9f6ca6d553c912da3d6.tar.gz
chromium_src-941635a75dae04279729e9f6ca6d553c912da3d6.tar.bz2
Revert 70920 - 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 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70782 Review URL: http://codereview.chromium.org/6070006 TBR=akalin@chromium.org Review URL: http://codereview.chromium.org/6099012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/webkit_support.cc3
-rw-r--r--webkit/tools/test_shell/test_shell.cc10
2 files changed, 5 insertions, 8 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 52a2a34..e9eed2e 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -93,8 +93,7 @@ void InitLogging(bool enable_gp_fault_error_box) {
logging::LOG_ONLY_TO_FILE,
// We might have multiple DumpRenderTree processes going at once.
logging::LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::DELETE_OLD_LOG_FILE);
// We want process and thread IDs because we may have multiple processes.
const bool kProcessId = true;
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index a1a6927..ce83655 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -417,12 +417,10 @@ void TestShell::InitLogging(bool suppress_error_dialogs,
FilePath log_filename;
PathService::Get(base::DIR_EXE, &log_filename);
log_filename = log_filename.AppendASCII("test_shell.log");
- logging::InitLogging(
- log_filename.value().c_str(),
- destination,
- logging::LOCK_LOG_FILE,
- logging::DELETE_OLD_LOG_FILE,
- logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+ logging::InitLogging(log_filename.value().c_str(),
+ destination,
+ logging::LOCK_LOG_FILE,
+ logging::DELETE_OLD_LOG_FILE);
// we want process and thread IDs because we may have multiple processes
logging::SetLogItems(true, true, false, true);