Use size instead of effective_size for partition_alloc.partitions.*

Bug: 810293
Change-Id: I0fdbb07ef9ebf78c964f9ffeb68dc21f9675bdb7
Reviewed-on: https://chromium-review.googlesource.com/1158112
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Reviewed-by: Siddhartha S <ssid@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580801}

chrome/browser/metrics/process_memory_metrics_emitter.cc

@@ -38,6 +38,7 @@ using ukm::builders::Memory_Experimental;
 namespace {
 
 const char kEffectiveSize[] = "effective_size";
+const char kSize[] = "size";
 const char kAllocatedObjectsSize[] = "allocated_objects_size";
 const bool kLargeMetric = true;
 
@@ -117,18 +118,18 @@ const Metric kAllocatorDumpNamesForMetrics[] = {
      kLargeMetric, kEffectiveSize, EmitTo::kUkmAndUmaAsSize,
      &Memory_Experimental::SetPartitionAlloc_AllocatedObjects},
     {"partition_alloc/partitions/array_buffer",
-     "PartitionAlloc.Partitions.ArrayBuffer", kLargeMetric, kEffectiveSize,
+     "PartitionAlloc.Partitions.ArrayBuffer", kLargeMetric, kSize,
      EmitTo::kUkmAndUmaAsSize,
      &Memory_Experimental::SetPartitionAlloc_Partitions_ArrayBuffer},
     {"partition_alloc/partitions/buffer", "PartitionAlloc.Partitions.Buffer",
-     kLargeMetric, kEffectiveSize, EmitTo::kUkmAndUmaAsSize,
+     kLargeMetric, kSize, EmitTo::kUkmAndUmaAsSize,
      &Memory_Experimental::SetPartitionAlloc_Partitions_Buffer},
     {"partition_alloc/partitions/fast_malloc",
-     "PartitionAlloc.Partitions.FastMalloc", kLargeMetric, kEffectiveSize,
+     "PartitionAlloc.Partitions.FastMalloc", kLargeMetric, kSize,
      EmitTo::kUkmAndUmaAsSize,
      &Memory_Experimental::SetPartitionAlloc_Partitions_FastMalloc},
     {"partition_alloc/partitions/layout", "PartitionAlloc.Partitions.Layout",
-     kLargeMetric, kEffectiveSize, EmitTo::kUkmAndUmaAsSize,
+     kLargeMetric, kSize, EmitTo::kUkmAndUmaAsSize,
      &Memory_Experimental::SetPartitionAlloc_Partitions_Layout},
     {"site_storage", "SiteStorage", kLargeMetric, kEffectiveSize,
      EmitTo::kUkmAndUmaAsSize, &Memory_Experimental::SetSiteStorage},

chrome/browser/metrics/process_memory_metrics_emitter_unittest.cc

@@ -189,7 +189,7 @@ void PopulateRendererMetrics(
   SetAllocatorDumpMetric(pmd, "blink_objects/Node", "object_count",
                          metrics_mb_or_count["NumberOfNodes"]);
   SetAllocatorDumpMetric(
-      pmd, "partition_alloc/partitions/array_buffer", "effective_size",
+      pmd, "partition_alloc/partitions/array_buffer", "size",
       metrics_mb_or_count["PartitionAlloc.Partitions.ArrayBuffer"] * 1024 *
           1024);