Fix desktop.memory measurement to emit memory-infra dumps.

tools/perf/benchmarks/memory.py

Index: tools/perf/benchmarks/memory.py
diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py
index 3b0df041247a9c3642998a2950d67d706018864b..d00f8cb5e333a63b03179754c3225bb80ceb3326 100644
--- a/tools/perf/benchmarks/memory.py
+++ b/tools/perf/benchmarks/memory.py
@@ -34,7 +34,6 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
         filter_string='-*,blink.console,disabled-by-default-memory-infra')
     tbm_options = timeline_based_measurement.Options(
         overhead_level=trace_memory)
-    tbm_options.config.enable_android_graphics_memtrack = True

[Primiano Tucci (use gerrit), 2017/03/21 15:33:06]

isn't this going to lose graphics memtrack coverage on android? I am missing
something here
I

[nednguyen, 2017/03/21 15:35:18]

Yeah, this should be removed for desktop memory benchmark only

[perezju, 2017/03/21 15:48:34]

This should not be removed at all. It is needed for android, and ignored
elsewhere:
https://github.com/catapult-project/catapult/blob/master/telemetry/telemetry/...

Was this causing any sort of issue?

[erikchen, 2017/03/21 17:11:34]

whoops, I wanted to only remove this for desktop. Let me just add it back, since
it doesn't negatively affect desktop

     tbm_options.SetTimelineBasedMetrics(['memoryMetric'])
     # Setting an empty memory dump config disables periodic dumps.
     tbm_options.config.chrome_trace_config.SetMemoryDumpConfig(
@@ -56,9 +55,12 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
 @benchmark.Owner(emails=['erikchen@chromium.org'])
 class MemoryBenchmarkTrivialSitesDesktop(_MemoryInfra):
   """Measure memory usage on trivial sites."""
-  page_set = page_sets.TrivialSitesStorySet
   options = {'pageset_repeat': 5}
 
+  def CreateStorySet(self, options):
+    return page_sets.TrivialSitesStorySet(wait_in_seconds=0,
+                                          measure_memory=True)
+
   @classmethod
   def Name(cls):
     return 'memory.desktop'