From c02cb8017a6b8ba62a88875e2034cf85c0d3c834 Mon Sep 17 00:00:00 2001 From: "wangxianzhu@chromium.org" Date: Fri, 14 Mar 2014 18:39:53 +0000 Subject: 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 --- base/prefs/pref_registry.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'base/prefs') 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, ¤t_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, ¤t_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)); } -- cgit v1.1