Integrate helper macros for calling histograms with different names (real-time vs screenshare and r…

webrtc/system_wrappers/include/metrics.h

 //
 // Copyright (c) 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 169 matching lines @@
 #define RTC_HISTOGRAMS_ENUMERATION(index, name, sample, boundary) \
   RTC_HISTOGRAMS_COMMON(index, name, sample, \
       RTC_HISTOGRAM_ENUMERATION(name, sample, boundary))
 
 #define RTC_HISTOGRAMS_PERCENTAGE(index, name, sample) \
   RTC_HISTOGRAMS_COMMON(index, name, sample, \
       RTC_HISTOGRAM_PERCENTAGE(name, sample))
 
 #define RTC_HISTOGRAMS_COMMON(index, name, sample, macro_invocation) \
   do { \
-    RTC_DCHECK(index >= 0); \
-    RTC_DCHECK(index <= 2); \
+    RTC_DCHECK_LE(index, 2u); \
     switch (index) { \
       case 0: \
         macro_invocation; \
         break; \
       case 1: \
         macro_invocation; \
         break; \
       case 2: \
         macro_invocation; \
         break; \
       default: \
         RTC_NOTREACHED(); \

[pbos-webrtc, 2016/02/03 11:56:56]

Maybe remove the DCHECK above and do RTC_NOTREACHED() << "Index " << index <<
"is out of bounds.";

[åsapersson, 2016/02/03 12:30:27]

Removed the DCHECK.

     } \
   } while (0)
 
 
 namespace webrtc {
 namespace metrics {
 
 // Time that should have elapsed for stats that are gathered once per call.
 enum { kMinRunTimeInSeconds = 10 };
 
@@ skipping 14 matching lines @@
 // Function for adding a |sample| to a histogram.
 // |name| can be used to verify that it matches the histogram name.
 void HistogramAdd(
     Histogram* histogram_pointer, const std::string& name, int sample);
 
 }  // namespace metrics
 }  // namespace webrtc
 
 #endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_H_