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

tools/perf/benchmarks/memory.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.timeline import chrome_trace_category_filter
@@ skipping 38 matching lines @@
     # each time before Chrome starts so we effect even the first page
     # - avoiding the bug.
     options.clear_sytem_cache_for_browser_and_profile_on_start = True
 
 
 @benchmark.Enabled('mac')
 @benchmark.Enabled('win')
 @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'
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
@@ skipping 197 matching lines @@
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/616530
     return cls.IsSvelte(possible_browser)