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

webrtc/system_wrappers/source/metrics_unittest.cc

 /*
  *  Copyright (c) 2015 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.
  */
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/test/histogram.h"
 
 namespace webrtc {
 namespace {
 const int kSample = 22;
 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)
 void AddSample(const std::string& name, int sample) {
   RTC_HISTOGRAM_COUNTS_100(name, sample);
 }
 #endif  // GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 }  // namespace
 
 TEST(MetricsTest, InitiallyNoSamples) {
@@ skipping 35 matching lines @@
   const int kNumSamples = 10;
   for (int i = 0; i < kNumSamples; ++i) {
     RTC_HISTOGRAM_COUNTS_100(kName, i);
   }
   EXPECT_EQ(kNumSamples, test::NumHistogramSamples(kName));
   EXPECT_EQ(kNumSamples - 1, test::LastHistogramSample(kName));
 }
 
 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"));
   EXPECT_EQ(kSample + 0, test::LastHistogramSample("Name1"));
   EXPECT_EQ(kSample + 1, test::LastHistogramSample("Name2"));
   EXPECT_EQ(kSample + 2, test::LastHistogramSample("Name3"));
 }
 
 #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
 
 TEST(MetricsTest, RtcHistogramSparse_NonConstantNameWorks) {
   test::ClearHistograms();
   AddSparseSample("Name1", kSample);
   AddSparseSample("Name2", kSample);
   EXPECT_EQ(1, test::NumHistogramSamples("Name1"));
   EXPECT_EQ(1, test::NumHistogramSamples("Name2"));
 }
 
 #if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(MetricsTest, RtcHistogram_FailsForNonConstantName) {
   test::ClearHistograms();
   AddSample("Name1", kSample);
   EXPECT_DEATH(AddSample("Name2", kSample), "");
 }
 #endif  // GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 }  // namespace webrtc