summaryrefslogtreecommitdiffstats
path: root/base/debug
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 03:06:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 03:06:12 +0000
commit2f4a8e1220d91ba95c2c46ec232dd53d27807ecd (patch)
treea353800ca5728e7c26423af7cccedf9812404d9a /base/debug
parent27488c22fe34d431fa34576032d8a0fc92b61572 (diff)
downloadchromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.zip
chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.gz
chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.bz2
Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base.
I tried hard not to change CHECKs that had side effects. I kept fatal checks that seemed security or debugging-info (in crash reports) sensitive, and ones that seems particularly well-conceived. Review URL: http://codereview.chromium.org/8368009 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8351025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r--base/debug/debugger.cc4
-rw-r--r--base/debug/trace_event.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/base/debug/debugger.cc b/base/debug/debugger.cc
index a0d8a92..3777fa1 100644
--- a/base/debug/debugger.cc
+++ b/base/debug/debugger.cc
@@ -15,8 +15,8 @@ bool WaitForDebugger(int wait_seconds, bool silent) {
#if defined(OS_ANDROID)
// The pid from which we know which process to attach to are not output by
// android ddms, so we have to print it out explicitly.
- DLOG(INFO) << "DebugUtil::WaitForDebugger(pid=" << static_cast<int>(getpid())
- << ")";
+ LOG(INFO) << "DebugUtil::WaitForDebugger(pid=" << static_cast<int>(getpid())
+ << ")";
#endif
for (int i = 0; i < wait_seconds * 10; ++i) {
if (BeingDebugged()) {
diff --git a/base/debug/trace_event.cc b/base/debug/trace_event.cc
index 63f057f..8b24cca 100644
--- a/base/debug/trace_event.cc
+++ b/base/debug/trace_event.cc
@@ -322,7 +322,7 @@ TraceLog::~TraceLog() {
const TraceCategory* TraceLog::GetCategory(const char* name) {
TraceLog* tracelog = GetInstance();
if (!tracelog){
- DCHECK(!g_category_already_shutdown->enabled);
+ CHECK(!g_category_already_shutdown->enabled);
return g_category_already_shutdown;
}
return tracelog->GetCategoryInternal(name);