[base/histograms] Add ByteCount overloads of memory metric functions

Most callsites of these histogram functions do a conversion to KB or MB,
so we add overloads of these functions to allow avoiding doing this conversion explicitly in the future.

NO_IFTTT=per comments from reviewer, this CL is only adding the function versions.

Bug: 429140103
Change-Id: I2b0e49e7667f62ca89f4d1d90db943305a947b11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6728222
Reviewed-by: Alexei Svitkine <[email protected]>
Commit-Queue: Thiabaud Engelbrecht <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1500187}
NOKEYCHECK=True
GitOrigin-RevId: 7b11c486f4e8032ec9d07981f4f753c38f1491a5

Author: Thiabaud Engelbrecht

metrics/histogram_functions.cc

@@ -311,40 +311,76 @@ void UmaHistogramMicrosecondsTimes(const char* name, TimeDelta sample) {
                                       Seconds(10), 50);
 }
 
-void UmaHistogramMemoryKB(std::string_view name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1000, 500000, 50);
+void UmaHistogramMemoryKB(std::string_view name, int sample_kb) {
+  UmaHistogramCustomCounts(name, sample_kb, 1000, 500000, 50);
 }
 
-void UmaHistogramMemoryKB(const std::string& name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1000, 500000, 50);
+void UmaHistogramMemoryKB(const std::string& name, int sample_kb) {
+  UmaHistogramCustomCounts(name, sample_kb, 1000, 500000, 50);
 }
 
-void UmaHistogramMemoryKB(const char* name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1000, 500000, 50);
+void UmaHistogramMemoryKB(const char* name, int sample_kb) {
+  UmaHistogramCustomCounts(name, sample_kb, 1000, 500000, 50);
 }
 
-void UmaHistogramMemoryMB(std::string_view name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 1000, 50);
+void UmaHistogramMemoryKB(std::string_view name, ByteCount sample) {
+  UmaHistogramMemoryKB(name, static_cast<int>(sample.InKiB()));
 }
 
-void UmaHistogramMemoryMB(const std::string& name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 1000, 50);
+void UmaHistogramMemoryKB(const std::string& name, ByteCount sample) {
+  UmaHistogramMemoryKB(name, static_cast<int>(sample.InKiB()));
 }
 
-void UmaHistogramMemoryMB(const char* name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 1000, 50);
+void UmaHistogramMemoryKB(const char* name, ByteCount sample) {
+  UmaHistogramMemoryKB(name, static_cast<int>(sample.InKiB()));
+}
+
+void UmaHistogramMemoryMB(std::string_view name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 1000, 50);
+}
+
+void UmaHistogramMemoryMB(const std::string& name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 1000, 50);
+}
+
+void UmaHistogramMemoryMB(const char* name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 1000, 50);
+}
+
+void UmaHistogramMemoryMB(std::string_view name, ByteCount sample) {
+  UmaHistogramMemoryMB(name, static_cast<int>(sample.InMiB()));
+}
+
+void UmaHistogramMemoryMB(const std::string& name, ByteCount sample) {
+  UmaHistogramMemoryMB(name, static_cast<int>(sample.InMiB()));
+}
+
+void UmaHistogramMemoryMB(const char* name, ByteCount sample) {
+  UmaHistogramMemoryMB(name, static_cast<int>(sample.InMiB()));
+}
+
+void UmaHistogramMemoryLargeMB(std::string_view name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 64000, 100);
+}
+
+void UmaHistogramMemoryLargeMB(const std::string& name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 64000, 100);
+}
+
+void UmaHistogramMemoryLargeMB(const char* name, int sample_mb) {
+  UmaHistogramCustomCounts(name, sample_mb, 1, 64000, 100);
 }
 
-void UmaHistogramMemoryLargeMB(std::string_view name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 64000, 100);
+void UmaHistogramMemoryLargeMB(std::string_view name, ByteCount sample) {
+  UmaHistogramMemoryLargeMB(name, static_cast<int>(sample.InMiB()));
 }
 
-void UmaHistogramMemoryLargeMB(const std::string& name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 64000, 100);
+void UmaHistogramMemoryLargeMB(const std::string& name, ByteCount sample) {
+  UmaHistogramMemoryLargeMB(name, static_cast<int>(sample.InMiB()));
 }
 
-void UmaHistogramMemoryLargeMB(const char* name, int sample) {
-  UmaHistogramCustomCounts(name, sample, 1, 64000, 100);
+void UmaHistogramMemoryLargeMB(const char* name, ByteCount sample) {
+  UmaHistogramMemoryLargeMB(name, static_cast<int>(sample.InMiB()));
 }
 
 void UmaHistogramSparse(std::string_view name, int sample) {

metrics/histogram_functions.h

@@ -12,6 +12,7 @@
 #include <type_traits>
 
 #include "base/base_export.h"
+#include "base/byte_count.h"
 #include "base/check_op.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
@@ -195,15 +196,19 @@ BASE_EXPORT void UmaHistogramMicrosecondsTimes(std::string_view name,
 // For recording memory-related histograms.
 // LINT.IfChange(UmaHistogramMemory)
 //
-// Used to measure common KB-granularity memory stats. Sample is in KB. Range is
-// from 1000KB (see crbug.com/40526504) to 500M. For measuring sizes less than
-// 1000K, use `UmaHistogramCounts`.
-BASE_EXPORT void UmaHistogramMemoryKB(std::string_view name, int sample);
-// Used to measure common MB-granularity memory stats. Sample is in MB. Range is
-// 1MB to ~1G.
-BASE_EXPORT void UmaHistogramMemoryMB(std::string_view name, int sample);
+// Used to measure common KB-granularity memory stats. Range is from 1000KB
+// (see crbug.com/40526504) to 500M. For measuring sizes less than 1000K, use
+// `UmaHistogramCounts`.
+BASE_EXPORT void UmaHistogramMemoryKB(std::string_view name, int sample_kb);
+BASE_EXPORT void UmaHistogramMemoryKB(std::string_view name, ByteCount sample);
+// Used to measure common MB-granularity memory stats. Range is 1MB to ~1G.
+BASE_EXPORT void UmaHistogramMemoryMB(std::string_view name, int sample_mb);
+BASE_EXPORT void UmaHistogramMemoryMB(std::string_view name, ByteCount sample);
 // Used to measure common MB-granularity memory stats. Range is 1MB to ~64G.
-BASE_EXPORT void UmaHistogramMemoryLargeMB(std::string_view name, int sample);
+BASE_EXPORT void UmaHistogramMemoryLargeMB(std::string_view name,
+                                           int sample_mb);
+BASE_EXPORT void UmaHistogramMemoryLargeMB(std::string_view name,
+                                           ByteCount sample);
 // LINT.ThenChange(/base/metrics/histogram_functions_internal_overloads.h:UmaHistogramMemory)
 
 // For recording sparse histograms.

metrics/histogram_functions_internal_overloads.h

@@ -14,6 +14,7 @@
 #include <type_traits>
 
 #include "base/base_export.h"
+#include "base/byte_count.h"
 #include "base/check_op.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
@@ -180,12 +181,21 @@ BASE_EXPORT void UmaHistogramMicrosecondsTimes(const char* name,
 // LINT.IfChange(UmaHistogramMemory)
 BASE_EXPORT void UmaHistogramMemoryKB(const std::string& name, int sample);
 BASE_EXPORT void UmaHistogramMemoryKB(const char* name, int sample);
+BASE_EXPORT void UmaHistogramMemoryKB(const std::string& name,
+                                      ByteCount sample);
+BASE_EXPORT void UmaHistogramMemoryKB(const char* name, ByteCount sample);
 
 BASE_EXPORT void UmaHistogramMemoryMB(const std::string& name, int sample);
 BASE_EXPORT void UmaHistogramMemoryMB(const char* name, int sample);
+BASE_EXPORT void UmaHistogramMemoryMB(const std::string& name,
+                                      ByteCount sample);
+BASE_EXPORT void UmaHistogramMemoryMB(const char* name, ByteCount sample);
 
 BASE_EXPORT void UmaHistogramMemoryLargeMB(const std::string& name, int sample);
 BASE_EXPORT void UmaHistogramMemoryLargeMB(const char* name, int sample);
+BASE_EXPORT void UmaHistogramMemoryLargeMB(const std::string& name,
+                                           ByteCount sample);
+BASE_EXPORT void UmaHistogramMemoryLargeMB(const char* name, ByteCount sample);
 // LINT.ThenChange(/base/metrics/histogram_functions.h:UmaHistogramMemory)
 
 // LINT.IfChange(UmaHistogramSparse)