metrics: Fix experimental memory histogram naming hierarchical structure

Author: Awallky

cobalt/browser/metrics/cobalt_memory_metrics_emitter.cc

@@ -64,31 +64,31 @@ const CobaltMemoryMetricsEmitter::Metric kAllocatorDumpNamesForMetrics[] = {
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
      {}},
     {"blink_objects/Document",
-     "NumberOfDocuments",
+     "Tiny.NumberOfDocuments",
      CobaltMemoryMetricsEmitter::MetricSize::kTiny,
      MemoryAllocatorDump::kNameObjectCount,
      CobaltMemoryMetricsEmitter::EmitTo::kCountsInUkmAndSizeInUma,
      {}},
     {"blink_objects/Frame",
-     "NumberOfFrames",
+     "Tiny.NumberOfFrames",
      CobaltMemoryMetricsEmitter::MetricSize::kTiny,
      MemoryAllocatorDump::kNameObjectCount,
      CobaltMemoryMetricsEmitter::EmitTo::kCountsInUkmAndSizeInUma,
      {}},
     {"blink_objects/LayoutObject",
-     "NumberOfLayoutObjects",
+     "Tiny.NumberOfLayoutObjects",
      CobaltMemoryMetricsEmitter::MetricSize::kTiny,
      MemoryAllocatorDump::kNameObjectCount,
      CobaltMemoryMetricsEmitter::EmitTo::kCountsInUkmAndSizeInUma,
      {}},
     {"blink_objects/Node",
-     "NumberOfNodes",
+     "Small.NumberOfNodes",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      MemoryAllocatorDump::kNameObjectCount,
      CobaltMemoryMetricsEmitter::EmitTo::kCountsInUkmAndSizeInUma,
      {}},
     {"font_caches/shape_caches",
-     "FontCaches",
+     "Small.FontCaches",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      "size",
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
@@ -100,7 +100,7 @@ const CobaltMemoryMetricsEmitter::Metric kAllocatorDumpNamesForMetrics[] = {
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
      {}},
     {"leveldatabase",
-     "LevelDatabase",
+     "Small.LevelDatabase",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      kEffectiveSize,
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
@@ -136,19 +136,19 @@ const CobaltMemoryMetricsEmitter::Metric kAllocatorDumpNamesForMetrics[] = {
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
      {}},
     {"skia/sk_glyph_cache",
-     "Skia.SkGlyphCache",
+     "Skia.Small.SkGlyphCache",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      "size",
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
      {}},
     {"sqlite",
-     "Sqlite",
+     "Small.Sqlite",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      kEffectiveSize,
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
      {}},
     {"ui",
-     "UI",
+     "Small.UI",
      CobaltMemoryMetricsEmitter::MetricSize::kSmall,
      kEffectiveSize,
      CobaltMemoryMetricsEmitter::EmitTo::kSizeInUkmAndUma,
@@ -177,8 +177,8 @@ const CobaltMemoryMetricsEmitter::Metric kAllocatorDumpNamesForMetrics[] = {
 
 constexpr char kExperimentalUmaPrefix[] = "Memory.Experimental.";
 constexpr char kVersionSuffixNormal[] = "2.";
-constexpr char kVersionSuffixSmall[] = "2.Small.";
-constexpr char kVersionSuffixTiny[] = "2.Tiny.";
+constexpr char kVersionSuffixSmall[] = "2.";
+constexpr char kVersionSuffixTiny[] = "2.";
 
 static const char* MetricSizeToVersionSuffix(
     CobaltMemoryMetricsEmitter::MetricSize size) {

cobalt/browser/metrics/font_metrics_browsertest.cc

@@ -91,10 +91,10 @@ IN_PROC_BROWSER_TEST_F(FontMetricsBrowserTest, RecordsFontHistograms) {
           .size(),
       1u);
 
-  EXPECT_GE(
-      histogram_tester.GetAllSamples("Memory.Experimental.Browser2.FontCaches")
-          .size(),
-      1u);
+  EXPECT_GE(histogram_tester
+                .GetAllSamples("Memory.Experimental.Browser2.Small.FontCaches")
+                .size(),
+            1u);
 }
 
 }  // namespace cobalt