Remove name parameter from HistogramAdd function.

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 92 matching lines @@
   RTC_HISTOGRAM_ENUMERATION(name, sample, 2)
 
 // Histogram for enumerators (evenly spaced buckets).
 // |boundary| should be above the max enumerator sample.
 #define RTC_HISTOGRAM_ENUMERATION(name, sample, boundary) \
   RTC_HISTOGRAM_COMMON_BLOCK(name, sample, \
       webrtc::metrics::HistogramFactoryGetEnumeration(name, boundary))
 
 // The name of the histogram should not vary.
 // TODO(asapersson): Consider changing string to const char*.
-#define RTC_HISTOGRAM_COMMON_BLOCK(constant_name, sample, \
-                                   factory_get_invocation) \
-  do { \
+#define RTC_HISTOGRAM_COMMON_BLOCK(constant_name, sample,                  \
+                                   factory_get_invocation)                 \
+  do {                                                                     \
     static webrtc::metrics::Histogram* atomic_histogram_pointer = nullptr; \
-    webrtc::metrics::Histogram* histogram_pointer = \
-        rtc::AtomicOps::AcquireLoadPtr(&atomic_histogram_pointer); \
-    if (!histogram_pointer) { \
-      histogram_pointer = factory_get_invocation; \
-      webrtc::metrics::Histogram* prev_pointer = \
-          rtc::AtomicOps::CompareAndSwapPtr( \
-              &atomic_histogram_pointer, \
-              static_cast<webrtc::metrics::Histogram*>(nullptr), \
-              histogram_pointer); \
-      RTC_DCHECK(prev_pointer == nullptr || \
-                 prev_pointer == histogram_pointer); \
-    } \
-    webrtc::metrics::HistogramAdd(histogram_pointer, constant_name, sample); \
+    webrtc::metrics::Histogram* histogram_pointer =                        \
+        rtc::AtomicOps::AcquireLoadPtr(&atomic_histogram_pointer);         \
+    if (!histogram_pointer) {                                              \
+      histogram_pointer = factory_get_invocation;                          \
+      webrtc::metrics::Histogram* prev_pointer =                           \
+          rtc::AtomicOps::CompareAndSwapPtr(                               \
+              &atomic_histogram_pointer,                                   \
+              static_cast<webrtc::metrics::Histogram*>(nullptr),           \
+              histogram_pointer);                                          \
+      RTC_DCHECK(prev_pointer == nullptr ||                                \
+                 prev_pointer == histogram_pointer);                       \
+    }                                                                      \
+    if (histogram_pointer) {                                               \
+      RTC_DCHECK_EQ(constant_name,                                         \
+                    webrtc::metrics::GetHistogramName(histogram_pointer))  \
+          << "The name should not vary.";                                  \
+      webrtc::metrics::HistogramAdd(histogram_pointer, sample);            \
+    }                                                                      \
   } while (0)
 
 // Deprecated.
 // The histogram is constructed/found for each call.
-// May be used for histograms with infrequent updates.
+// May be used for histograms with infrequent updates.`
 #define RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample, factory_get_invocation) \
-  do { \
-    webrtc::metrics::Histogram* histogram_pointer = factory_get_invocation; \
-    webrtc::metrics::HistogramAdd(histogram_pointer, name, sample); \
+  do {                                                                        \
+    webrtc::metrics::Histogram* histogram_pointer = factory_get_invocation;   \
+    if (histogram_pointer) {                                                  \
+      webrtc::metrics::HistogramAdd(histogram_pointer, sample);               \
+    }                                                                         \
   } while (0)
 
-
 // Helper macros.
 // Macros for calling a histogram with varying name (e.g. when using a metric
 // in different modes such as real-time vs screenshare).
 #define RTC_HISTOGRAMS_COUNTS_100(index, name, sample) \
   RTC_HISTOGRAMS_COMMON(index, name, sample, \
       RTC_HISTOGRAM_COUNTS(name, sample, 1, 100, 50))
 
 #define RTC_HISTOGRAMS_COUNTS_200(index, name, sample) \
   RTC_HISTOGRAMS_COMMON(index, name, sample, \
       RTC_HISTOGRAM_COUNTS(name, sample, 1, 200, 50))
@@ skipping 53 matching lines @@
 
 // Get histogram for counters.
 Histogram* HistogramFactoryGetCounts(
     const std::string& name, int min, int max, int bucket_count);
 
 // Get histogram for enumerators.
 // |boundary| should be above the max enumerator sample.
 Histogram* HistogramFactoryGetEnumeration(
     const std::string& name, int boundary);
 
+// Returns name of the histogram.
+const std::string& GetHistogramName(Histogram* histogram_pointer);
+
 // 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);
+void HistogramAdd(Histogram* histogram_pointer, int sample);
 
 }  // namespace metrics
 }  // namespace webrtc
 
 #endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_H_