Switch CustomHistogram::ArrayToCustomRanges to base::span<>

While at it, also rename the method to ArrayToCustomEnumRanges and
close out an old TODO.

TBR=hubbe@chromium.org, kbr@chromium.org
BUG=837308

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I56464a852707550dd625a1da30186aaaa9fdef38
Reviewed-on: https://chromium-review.googlesource.com/1055947
Commit-Queue: Ryan Sleevi <rsleevi@chromium.org>
Reviewed-by: Xing Liu <xingliu@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558089}

base/metrics/histogram.cc

@@ -1193,11 +1193,10 @@ HistogramType CustomHistogram::GetHistogramType() const {
 }
 
 // static
-std::vector<Sample> CustomHistogram::ArrayToCustomRanges(
-    const Sample* values, uint32_t num_values) {
+std::vector<Sample> CustomHistogram::ArrayToCustomEnumRanges(
+    base::span<const Sample> values) {
   std::vector<Sample> all_values;
-  for (uint32_t i = 0; i < num_values; ++i) {
-    Sample value = values[i];
+  for (Sample value : values) {
     all_values.push_back(value);
 
     // Ensure that a guard bucket is added. If we end up with duplicate

base/metrics/histogram.h

@@ -74,6 +74,7 @@
 
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
+#include "base/containers/span.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ -513,9 +514,9 @@ class BASE_EXPORT CustomHistogram : public Histogram {
   // This function ensures that a guard bucket exists right after any
   // valid sample value (unless the next higher sample is also a valid value),
   // so that invalid samples never fall into the same bucket as valid samples.
-  // TODO(kaiwang): Change name to ArrayToCustomEnumRanges.
-  static std::vector<Sample> ArrayToCustomRanges(const Sample* values,
-                                                 uint32_t num_values);
+  static std::vector<Sample> ArrayToCustomEnumRanges(
+      base::span<const Sample> values);
+
  protected:
   class Factory;
 

base/metrics/histogram_macros.h

@@ -326,8 +326,8 @@
 // Samples should be one of the std::vector<int> list provided via
 // |custom_ranges|. See comments above CustomRanges::FactoryGet about the
 // requirement of |custom_ranges|. You can use the helper function
-// CustomHistogram::ArrayToCustomRanges to transform a C-style array of valid
-// sample values to a std::vector<int>.
+// CustomHistogram::ArrayToCustomEnumRanges to transform a C-style array of
+// valid sample values to a std::vector<int>.
 #define UMA_HISTOGRAM_CUSTOM_ENUMERATION(name, sample, custom_ranges)          \
     STATIC_HISTOGRAM_POINTER_BLOCK(name, Add(sample),                          \
         base::CustomHistogram::FactoryGet(name, custom_ranges,                 \

base/metrics/histogram_unittest.cc

@@ -292,10 +292,10 @@ TEST_P(HistogramTest, LinearRangesTest) {
   EXPECT_TRUE(ranges2.Equals(histogram2->bucket_ranges()));
 }
 
-TEST_P(HistogramTest, ArrayToCustomRangesTest) {
+TEST_P(HistogramTest, ArrayToCustomEnumRangesTest) {
   const HistogramBase::Sample ranges[3] = {5, 10, 20};
   std::vector<HistogramBase::Sample> ranges_vec =
-      CustomHistogram::ArrayToCustomRanges(ranges, 3);
+      CustomHistogram::ArrayToCustomEnumRanges(ranges);
   ASSERT_EQ(6u, ranges_vec.size());
   EXPECT_EQ(5, ranges_vec[0]);
   EXPECT_EQ(6, ranges_vec[1]);

components/download/internal/common/base_file_win.cc

@@ -257,25 +257,22 @@ DownloadInterruptReason MapShFileOperationCodes(int code) {
   if (result == DOWNLOAD_INTERRUPT_REASON_FILE_FAILED) {
     UMA_HISTOGRAM_CUSTOM_ENUMERATION(
         "Download.MapWinShErrorFileFailed", code,
-        base::CustomHistogram::ArrayToCustomRanges(
-            kAllSpecialShFileOperationCodes,
-            arraysize(kAllSpecialShFileOperationCodes)));
+        base::CustomHistogram::ArrayToCustomEnumRanges(
+            kAllSpecialShFileOperationCodes));
   }
 
   if (result == DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED) {
     UMA_HISTOGRAM_CUSTOM_ENUMERATION(
         "Download.MapWinShErrorAccessDenied", code,
-        base::CustomHistogram::ArrayToCustomRanges(
-            kAllSpecialShFileOperationCodes,
-            arraysize(kAllSpecialShFileOperationCodes)));
+        base::CustomHistogram::ArrayToCustomEnumRanges(
+            kAllSpecialShFileOperationCodes));
   }
 
   if (result == DOWNLOAD_INTERRUPT_REASON_FILE_TRANSIENT_ERROR) {
     UMA_HISTOGRAM_CUSTOM_ENUMERATION(
         "Download.MapWinShErrorTransientError", code,
-        base::CustomHistogram::ArrayToCustomRanges(
-            kAllSpecialShFileOperationCodes,
-            arraysize(kAllSpecialShFileOperationCodes)));
+        base::CustomHistogram::ArrayToCustomEnumRanges(
+            kAllSpecialShFileOperationCodes));
   }
 
   if (result != DOWNLOAD_INTERRUPT_REASON_NONE)

components/download/internal/common/download_stats.cc

@@ -377,8 +377,7 @@ void RecordDownloadInterrupted(DownloadInterruptReason reason,
   }
 
   std::vector<base::HistogramBase::Sample> samples =
-      base::CustomHistogram::ArrayToCustomRanges(
-          kAllInterruptReasonCodes, arraysize(kAllInterruptReasonCodes));
+      base::CustomHistogram::ArrayToCustomEnumRanges(kAllInterruptReasonCodes);
   UMA_HISTOGRAM_CUSTOM_ENUMERATION("Download.InterruptedReason", reason,
                                    samples);
 

gpu/command_buffer/service/gl_utils.cc

@@ -103,8 +103,7 @@ std::vector<int> GetAllGLErrors() {
       GL_INVALID_FRAMEBUFFER_OPERATION,
       GL_OUT_OF_MEMORY,
   };
-  return base::CustomHistogram::ArrayToCustomRanges(gl_errors,
-                                                    arraysize(gl_errors));
+  return base::CustomHistogram::ArrayToCustomEnumRanges(gl_errors);
 }
 
 bool PrecisionMeetsSpecForHighpFloat(GLint rangeMin,

media/filters/ffmpeg_demuxer.cc

@@ -130,8 +130,7 @@ static void UmaHistogramAspectRatio(const char* name, const T& size) {
       name,
       // Intentionally use integer division to truncate the result.
       size.height() ? (size.width() * 100) / size.height() : kInfiniteRatio,
-      base::CustomHistogram::ArrayToCustomRanges(
-          kCommonAspectRatios100, arraysize(kCommonAspectRatios100)));
+      base::CustomHistogram::ArrayToCustomEnumRanges(kCommonAspectRatios100));
 }
 
 // Record detected track counts by type corresponding to a src= playback.

media/remoting/metrics.cc

@@ -193,8 +193,7 @@ void SessionMetricsRecorder::RecordVideoConfiguration() {
                             last_video_profile_, VIDEO_CODEC_PROFILE_MAX + 1);
   UMA_HISTOGRAM_CUSTOM_ENUMERATION(
       "Media.Remoting.VideoNaturalWidth", last_natural_size_.width(),
-      base::CustomHistogram::ArrayToCustomRanges(
-          kVideoWidthBuckets, arraysize(kVideoWidthBuckets)));
+      base::CustomHistogram::ArrayToCustomEnumRanges(kVideoWidthBuckets));
   // Intentionally use integer division to truncate the result.
   const int aspect_ratio_100 =
       last_natural_size_.height()
@@ -202,8 +201,7 @@ void SessionMetricsRecorder::RecordVideoConfiguration() {
           : kInfiniteRatio;
   UMA_HISTOGRAM_CUSTOM_ENUMERATION(
       "Media.Remoting.VideoAspectRatio", aspect_ratio_100,
-      base::CustomHistogram::ArrayToCustomRanges(
-          kCommonAspectRatios100, arraysize(kCommonAspectRatios100)));
+      base::CustomHistogram::ArrayToCustomEnumRanges(kCommonAspectRatios100));
 }
 
 void SessionMetricsRecorder::RecordTrackConfiguration() {

net/cert/cert_verify_proc.cc

@@ -105,16 +105,14 @@ void RecordPublicKeyHistogram(const char* chain_position,
     // binary curves - which range from 163 bits to 571 bits.
     counter = base::CustomHistogram::FactoryGet(
         histogram_name,
-        base::CustomHistogram::ArrayToCustomRanges(kEccKeySizes,
-                                                   arraysize(kEccKeySizes)),
+        base::CustomHistogram::ArrayToCustomEnumRanges(kEccKeySizes),
         base::HistogramBase::kUmaTargetedHistogramFlag);
   } else {
     // Key sizes < 1024 bits should cause errors, while key sizes > 16K are not
     // uniformly supported by the underlying cryptographic libraries.
     counter = base::CustomHistogram::FactoryGet(
         histogram_name,
-        base::CustomHistogram::ArrayToCustomRanges(kRsaDsaKeySizes,
-                                                   arraysize(kRsaDsaKeySizes)),
+        base::CustomHistogram::ArrayToCustomEnumRanges(kRsaDsaKeySizes),
         base::HistogramBase::kUmaTargetedHistogramFlag);
   }
   counter->Add(size_bits);

net/dns/host_resolver_impl.cc

@@ -172,8 +172,7 @@ std::vector<int> GetAllGetAddrinfoOSErrors() {
     os_errors[i] = std::abs(os_errors[i]);
   }
 
-  return base::CustomHistogram::ArrayToCustomRanges(os_errors,
-                                                    arraysize(os_errors));
+  return base::CustomHistogram::ArrayToCustomEnumRanges(os_errors);
 }
 
 enum DnsResolveStatus {