Add dump_count:heap_profiler in memory metric.

tracing/tracing/metrics/system_health/memory_metric_test.html

Index: tracing/tracing/metrics/system_health/memory_metric_test.html
diff --git a/tracing/tracing/metrics/system_health/memory_metric_test.html b/tracing/tracing/metrics/system_health/memory_metric_test.html
index 36936bbbc4880e761dc451e584bfd4c2616ca7be..c10a789c3c4a0d05566c5a73274a6a131294cbff 100644
--- a/tracing/tracing/metrics/system_health/memory_metric_test.html
+++ b/tracing/tracing/metrics/system_health/memory_metric_test.html
@@ -10,6 +10,7 @@ found in the LICENSE file.
 <link rel="import" href="/tracing/core/test_utils.html">
 <link rel="import" href="/tracing/metrics/system_health/memory_metric.html">
 <link rel="import" href="/tracing/model/container_memory_dump.html">
+<link rel="import" href="/tracing/model/heap_dump.html">
 <link rel="import" href="/tracing/model/memory_dump_test_utils.html">
 <link rel="import" href="/tracing/model/vm_region.html">
 <link rel="import" href="/tracing/value/histogram_set.html">
@@ -174,6 +175,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:dump_count': {
       value: [0],
       unit: count_smallerIsBetter,
@@ -206,6 +213,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by ' +
           'Chrome(2) to the trace'
     },
+    'memory:chrome2:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome(2) to the trace'
+    },
     'memory:chrome2:all_processes:dump_count': {
       value: [0],
       unit: count_smallerIsBetter,
@@ -230,6 +243,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:dump_count': {
       value: [0],
       unit: count_smallerIsBetter,
@@ -254,6 +273,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by WebView ' +
           'to the trace'
     },
+    'memory:webview:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'WebView to the trace'
+    },
     'memory:webview:all_processes:dump_count': {
       value: [0],
       unit: count_smallerIsBetter,
@@ -286,6 +311,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by an ' +
           'unknown browser to the trace'
     },
+    'memory:unknown_browser:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by an ' +
+          'unknown browser to the trace'
+    },
     'memory:unknown_browser:all_processes:dump_count': {
       value: [4],
       unit: count_smallerIsBetter,
@@ -319,6 +350,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by WebView ' +
           'to the trace'
     },
+    'memory:webview:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'WebView to the trace'
+    },
     'memory:webview:all_processes:dump_count': {
       value: [2],
       unit: count_smallerIsBetter,
@@ -554,6 +591,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:dump_count': {
       value: [4],
       unit: count_smallerIsBetter,
@@ -1084,6 +1127,12 @@ tr.b.unittest.testSuite(function() {
       new VMRegion(0xABCD, 128, 0, '/dev/ashmem/dalvik-non moving space',
           {privateDirtyResident: 8})
     ]);
+    pmdBrowser1.heapDumps = (function() {
+      var mallocDump = new tr.model.HeapDump(pmdBrowser1, 'malloc');
+      mallocDump.addEntry(undefined, undefined, 100, 500);
+      return {'malloc': mallocDump};
+    })();
+
     var pmdRendererA1 = addProcessMemoryDump(gmd1, pRendererA, {ts: 10});
     pmdRendererA1.vmRegions = VMRegionClassificationNode.fromRegions([
       new VMRegion(0xEF01, 256, 0, '[anon:libc_malloc]',
@@ -1174,6 +1223,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by an ' +
           'unknown browser to the trace'
     },
+    'memory:unknown_browser:all_processes:dump_count:heap_profiler': {
+      value: [1],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by an ' +
+          'unknown browser to the trace'
+    },
     'memory:unknown_browser:all_processes:dump_count': {
       value: [4],
       unit: count_smallerIsBetter,
@@ -1586,6 +1641,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:dump_count': {
       value: [3],
       unit: count_smallerIsBetter,
@@ -1910,6 +1971,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by WebView ' +
           'to the trace'
     },
+    'memory:webview:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'WebView to the trace'
+    },
     'memory:webview:all_processes:dump_count': {
       value: [3],
       unit: count_smallerIsBetter,
@@ -2240,6 +2307,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:dump_count': {
       value: [3],
       unit: count_smallerIsBetter,
@@ -2640,6 +2713,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by ' +
           'Chrome(2) to the trace'
     },
+    'memory:chrome2:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome(2) to the trace'
+    },
     'memory:chrome2:all_processes:dump_count': {
       value: [2],
       unit: count_smallerIsBetter,
@@ -2914,6 +2993,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by an ' +
           'unknown browser to the trace'
     },
+    'memory:unknown_browser:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by an ' +
+          'unknown browser to the trace'
+    },
     'memory:unknown_browser:all_processes:dump_count': {
       value: [1],
       unit: count_smallerIsBetter,
@@ -3034,6 +3119,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by Chrome ' +
           'to the trace'
     },
+    'memory:chrome:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'Chrome to the trace'
+    },
     'memory:chrome:all_processes:process_count': {
       value: [1, 1, 1],
       unit: count_smallerIsBetter,
@@ -3069,6 +3160,12 @@ tr.b.unittest.testSuite(function() {
       description: 'total number of background memory dumps added by WebView ' +
           'to the trace'
     },
+    'memory:webview:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by ' +
+          'WebView to the trace'
+    },
     'memory:webview:all_processes:process_count': {
       value: [1, 1, 1, 1],
       unit: count_smallerIsBetter,
@@ -3239,6 +3336,12 @@ tr.b.unittest.testSuite(function() {
       unit: count_smallerIsBetter,
       description: 'total number of background memory dumps added by an ' +
           'unknown browser to the trace'
+    },
+    'memory:unknown_browser:all_processes:dump_count:heap_profiler': {
+      value: [0],
+      unit: count_smallerIsBetter,
+      description: 'total number of heap profiler memory dumps added by an ' +
+          'unknown browser to the trace'
     }
   });