summaryrefslogtreecommitdiffstats
path: root/base/prefs
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 18:39:53 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 18:39:53 +0000
commitc02cb8017a6b8ba62a88875e2034cf85c0d3c834 (patch)
treeff96ee0d2b577bb7e04c70a7f7d636d8eea37f00 /base/prefs
parenta396b7b69af2d934760838cad25e6579d7d62d77 (diff)
downloadchromium_src-c02cb8017a6b8ba62a88875e2034cf85c0d3c834.zip
chromium_src-c02cb8017a6b8ba62a88875e2034cf85c0d3c834.tar.gz
chromium_src-c02cb8017a6b8ba62a88875e2034cf85c0d3c834.tar.bz2
Change DCHECK_IS_ON() to DCHECK_IS_ON
DCHECK_IS_ON has been a constant since r255987, and can be used in both if() and #if. It no more needs to be in function form. Converted 'if (DCHECK_IS_ON)' to '#if DCHECK_IS_ON' if proper. BUG=350462 TEST=build TBR=darin Review URL: https://codereview.chromium.org/195973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/prefs')
-rw-r--r--base/prefs/pref_registry.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/base/prefs/pref_registry.cc b/base/prefs/pref_registry.cc
index 9d6b05c..1349961 100644
--- a/base/prefs/pref_registry.cc
+++ b/base/prefs/pref_registry.cc
@@ -31,13 +31,11 @@ PrefRegistry::const_iterator PrefRegistry::end() const {
void PrefRegistry::SetDefaultPrefValue(const char* pref_name,
base::Value* value) {
DCHECK(value);
- if (DCHECK_IS_ON()) {
- const base::Value* current_value = NULL;
- DCHECK(defaults_->GetValue(pref_name, &current_value))
- << "Setting default for unregistered pref: " << pref_name;
- DCHECK(value->IsType(current_value->GetType()))
- << "Wrong type for new default: " << pref_name;
- }
+ const base::Value* current_value = NULL;
+ DCHECK(defaults_->GetValue(pref_name, &current_value))
+ << "Setting default for unregistered pref: " << pref_name;
+ DCHECK(value->IsType(current_value->GetType()))
+ << "Wrong type for new default: " << pref_name;
defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value));
}