metrics: Fix build error in tests and apply formatting

Author: Awallky

cobalt/browser/metrics/cobalt_metrics_service_client_test.cc

@@ -81,6 +81,18 @@ class TestProcessMemoryMetricsEmitter : public CobaltMemoryMetricsEmitter {
     malloc_dump->numeric_entries["allocated_objects_size"] = 8 * 1024 * 1024;
     browser_dump->chrome_allocator_dumps["malloc"] = std::move(malloc_dump);
 
+    // Add Skia Glyph Cache dump
+    auto skia_dump = memory_instrumentation::mojom::AllocatorMemDump::New();
+    skia_dump->numeric_entries["size"] = 2 * 1024 * 1024;
+    browser_dump->chrome_allocator_dumps["skia/sk_glyph_cache"] =
+        std::move(skia_dump);
+
+    // Add Font Caches dump
+    auto font_dump = memory_instrumentation::mojom::AllocatorMemDump::New();
+    font_dump->numeric_entries["size"] = 512 * 1024;
+    browser_dump->chrome_allocator_dumps["font_caches/shape_caches"] =
+        std::move(font_dump);
+
     dump_ptr->process_dumps.push_back(std::move(browser_dump));
 
     auto global_dump =
@@ -368,48 +380,12 @@ TEST_F(CobaltMetricsServiceClientTest, RecordMemoryMetricsRecordsHistogram) {
           .GetAllSamples("Memory.Experimental.Browser2.Malloc.AllocatedObjects")
           .size(),
       1u);
-}
-
-TEST_F(CobaltMetricsServiceClientTest,
-       RecordMemoryMetricsRecordsExperimentalHistograms) {
-  base::HistogramTester histogram_tester;
-
-  memory_instrumentation::mojom::GlobalMemoryDumpPtr dump_ptr =
-      memory_instrumentation::mojom::GlobalMemoryDump::New();
-
-  auto process_dump = memory_instrumentation::mojom::ProcessMemoryDump::New();
-  process_dump->process_type =
-      memory_instrumentation::mojom::ProcessType::BROWSER;
-  process_dump->os_dump = memory_instrumentation::mojom::OSMemDump::New();
 
-  // 2MB in bytes
-  const uint64_t kSkiaGlyphCacheSize = 2 * 1024 * 1024;
-  // 512KB in bytes
-  const uint64_t kFontCacheSize = 512 * 1024;
-
-  auto skia_dump = memory_instrumentation::mojom::AllocatorMemDump::New();
-  skia_dump->numeric_entries["size"] = kSkiaGlyphCacheSize;
-  process_dump->chrome_allocator_dumps["skia/sk_glyph_cache"] =
-      std::move(skia_dump);
-
-  auto font_dump = memory_instrumentation::mojom::AllocatorMemDump::New();
-  font_dump->numeric_entries["size"] = kFontCacheSize;
-  process_dump->chrome_allocator_dumps["font_caches/shape_caches"] =
-      std::move(font_dump);
-
-  dump_ptr->process_dumps.push_back(std::move(process_dump));
-
-  auto global_dump =
-      memory_instrumentation::GlobalMemoryDump::MoveFrom(std::move(dump_ptr));
-
-  CobaltMetricsServiceClient::RecordMemoryMetrics(global_dump.get());
-
-  // Values should be in KB
+  // Experimental histograms (now with .Small. suffix in KB)
+  histogram_tester.ExpectUniqueSample(
+      "Memory.Experimental.Browser2.Skia.Small.SkGlyphCache", 2048, 1);
   histogram_tester.ExpectUniqueSample(
-      "Memory.Experimental.Browser2.Skia.SkGlyphCache",
-      kSkiaGlyphCacheSize / 1024, 1);
-  histogram_tester.ExpectUniqueSample("Memory.Experimental.Browser2.FontCaches",
-                                      kFontCacheSize / 1024, 1);
+      "Memory.Experimental.Browser2.Small.FontCaches", 512, 1);
 }
 
 TEST_F(CobaltMetricsServiceClientTest,

cobalt/browser/metrics/font_metrics_browsertest.cc

@@ -85,10 +85,11 @@ IN_PROC_BROWSER_TEST_F(FontMetricsBrowserTest, RecordsFontHistograms) {
           .size(),
       1u);
 
-  EXPECT_GE(histogram_tester
-                .GetAllSamples("Memory.Experimental.Browser2.Skia.Small.SkGlyphCache")
-                .size(),
-            1u);
+  EXPECT_GE(
+      histogram_tester
+          .GetAllSamples("Memory.Experimental.Browser2.Skia.Small.SkGlyphCache")
+          .size(),
+      1u);
 
   EXPECT_GE(
       histogram_tester.GetAllSamples("Memory.Experimental.Browser2.FontCaches")