AW: Add Memory.Total.PrivateMemoryFootprint

Bug: 10128236
Change-Id: Ibe238ddd409a00ae256d15e705d2c95dfad67f52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849633
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704830}

android_webview/browser/metrics/memory_metrics_logger.cc

@@ -36,7 +36,9 @@ void RecordMemoryMetricsImpl(
     return;
   }
 
+  uint64_t total_private_footprint_kb = 0;
   for (const auto& process_dump : dump->process_dumps()) {
+    total_private_footprint_kb += process_dump.os_dump().private_footprint_kb;
     switch (process_dump.process_type()) {
       case memory_instrumentation::mojom::ProcessType::BROWSER: {
         MEMORY_METRICS_HISTOGRAM_MB(
@@ -67,6 +69,10 @@ void RecordMemoryMetricsImpl(
         break;
     }
   }
+  if (total_private_footprint_kb) {
+    MEMORY_METRICS_HISTOGRAM_MB("Memory.Total.PrivateMemoryFootprint",
+                                total_private_footprint_kb / 1024);
+  }
   if (done_callback)
     std::move(done_callback).Run(true);
 }

android_webview/javatests/src/org/chromium/android_webview/test/MemoryMetricsLoggerTest.java

@@ -54,6 +54,9 @@ public class MemoryMetricsLoggerTest {
         Assert.assertNotEquals(0,
                 RecordHistogram.getHistogramTotalCountForTesting(
                         "Memory.Renderer.PrivateMemoryFootprint"));
+        Assert.assertNotEquals(0,
+                RecordHistogram.getHistogramTotalCountForTesting(
+                        "Memory.Total.PrivateMemoryFootprint"));
     }
 
     @Test
@@ -64,9 +67,13 @@ public class MemoryMetricsLoggerTest {
         Assert.assertNotEquals(0,
                 RecordHistogram.getHistogramTotalCountForTesting(
                         "Memory.Browser.PrivateMemoryFootprint"));
+        // Verify no renderer record in single process mode.
         Assert.assertEquals(0,
                 RecordHistogram.getHistogramTotalCountForTesting(
                         "Memory.Renderer.PrivateMemoryFootprint"));
+        Assert.assertNotEquals(0,
+                RecordHistogram.getHistogramTotalCountForTesting(
+                        "Memory.Total.PrivateMemoryFootprint"));
     }
 
     /**