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

webrtc/system_wrappers/source/metrics_unittest.cc

Index: webrtc/system_wrappers/source/metrics_unittest.cc
diff --git a/webrtc/system_wrappers/source/metrics_unittest.cc b/webrtc/system_wrappers/source/metrics_unittest.cc
index 7de6f5e6ee8bfc2a0bed01a52fc9a8b520a487eb..45d3e3f464d4d0ef5f79dfd45f55b2c0c95b2ab0 100644
--- a/webrtc/system_wrappers/source/metrics_unittest.cc
+++ b/webrtc/system_wrappers/source/metrics_unittest.cc
@@ -21,7 +21,9 @@ const std::string kName = "Name";
 void AddSparseSample(const std::string& name, int sample) {
   RTC_HISTOGRAM_COUNTS_SPARSE_100(name, sample);
 }
-void AddSampleWithVaryingName(int index, const std::string& name, int sample) {
+void AddSampleWithVaryingName(size_t index,
+                              const std::string& name,
+                              int sample) {
   RTC_HISTOGRAMS_COUNTS_100(index, name, sample);
 }
 #if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
@@ -77,9 +79,9 @@ TEST(MetricsTest, RtcHistogramCounts_AddMultipleSamples) {
 
 TEST(MetricsTest, RtcHistogramsCounts_AddSample) {
   test::ClearHistograms();
-  AddSampleWithVaryingName(0, "Name1", kSample);
-  AddSampleWithVaryingName(1, "Name2", kSample + 1);
-  AddSampleWithVaryingName(2, "Name3", kSample + 2);
+  AddSampleWithVaryingName(0u, "Name1", kSample);
+  AddSampleWithVaryingName(1u, "Name2", kSample + 1);
+  AddSampleWithVaryingName(2u, "Name3", kSample + 2);
   EXPECT_EQ(1, test::NumHistogramSamples("Name1"));
   EXPECT_EQ(1, test::NumHistogramSamples("Name2"));
   EXPECT_EQ(1, test::NumHistogramSamples("Name3"));
@@ -90,8 +92,6 @@ TEST(MetricsTest, RtcHistogramsCounts_AddSample) {
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(MetricsTest, RtcHistogramsCounts_InvalidIndex) {
-  EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(-1, kName, kSample), "");
-  EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(3, kName, kSample), "");
   EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(3u, kName, kSample), "");
 }
 #endif