Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere

webrtc/api/statstypes.cc

 /*
  *  Copyright 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 258 matching lines @@
   RTC_DCHECK_EQ(type_, other.type_);
 
   switch (type_) {
     case kInt:
       return value_.int_ == other.value_.int_;
     case kInt64:
       return value_.int64_ == other.value_.int64_;
     case kFloat:
       return value_.float_ == other.value_.float_;
     case kStaticString: {
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+#if RTC_DCHECK_IS_ON
       if (value_.static_string_ != other.value_.static_string_) {
         RTC_DCHECK(strcmp(value_.static_string_, other.value_.static_string_) !=
                    0)
             << "Duplicate global?";
       }
 #endif
       return value_.static_string_ == other.value_.static_string_;
     }
     case kString:
       return *value_.string_ == *other.value_.string_;
     case kBool:
       return value_.bool_ == other.value_.bool_;
     case kId:
       return (*value_.id_)->Equals(*other.value_.id_);
   }
   RTC_NOTREACHED();
   return false;
 }
 
 bool StatsReport::Value::operator==(const std::string& value) const {
   return (type_ == kString && value_.string_->compare(value) == 0) ||
          (type_ == kStaticString && value.compare(value_.static_string_) == 0);
 }
 
 bool StatsReport::Value::operator==(const char* value) const {
   if (type_ == kString)
     return value_.string_->compare(value) == 0;
   if (type_ != kStaticString)
     return false;
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+#if RTC_DCHECK_IS_ON
   if (value_.static_string_ != value)
     RTC_DCHECK(strcmp(value_.static_string_, value) != 0)
         << "Duplicate global?";
 #endif
   return value == value_.static_string_;
 }
 
 bool StatsReport::Value::operator==(int64_t value) const {
   return type_ == kInt ? value_.int_ == static_cast<int>(value) :
       (type_ == kInt64 ? value_.int64_ == value : false);
@@ skipping 452 matching lines @@
 // Looks for a report with the given |id|.  If one is not found, NULL
 // will be returned.
 StatsReport* StatsCollection::Find(const StatsReport::Id& id) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   Container::iterator it = std::find_if(list_.begin(), list_.end(),
       [&id](const StatsReport* r)->bool { return r->id()->Equals(id); });
   return it == list_.end() ? nullptr : *it;
 }
 
 }  // namespace webrtc