summaryrefslogtreecommitdiffstats
path: root/base/logging.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 05:30:14 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 05:30:14 +0000
commitdeba0ff3212e9c8a263ade6280cfba4c5a1843d1 (patch)
tree252afd483e5d6881bb416fe8ebf6ff6d3236e171 /base/logging.cc
parent31fae38c6ce11c9b651f95d2626710f85426dbe8 (diff)
downloadchromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.zip
chromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.tar.gz
chromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.tar.bz2
Fixed bug where CHECKs don't fire if min_log_level > FATAL
BUG=61510 TEST=New unittests in base_unittests Review URL: http://codereview.chromium.org/4262001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
-rw-r--r--base/logging.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/logging.cc b/base/logging.cc
index a9ce815..ee4a4da 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -382,7 +382,7 @@ bool BaseInitLoggingImpl(const PathChar* new_log_file,
}
void SetMinLogLevel(int level) {
- min_log_level = level;
+ min_log_level = std::min(LOG_ERROR_REPORT, level);
}
int GetMinLogLevel() {