[Telemetry] Move memory benchmarks to StoryExpectations.

TBR=charliea@chromium.org

Bug: 713222
Change-Id: I08457ceba85b7449c7809bf06983b1c3da5965eb
Reviewed-on: https://chromium-review.googlesource.com/539819Reviewed-by: rnephew <rnephew@chromium.org>
Commit-Queue: rnephew <rnephew@chromium.org>
Cr-Commit-Position: refs/heads/master@{#480542}

tools/perf/benchmarks/memory.py

@@ -83,6 +83,9 @@ class MemoryBenchmarkTrivialSitesDesktop(_MemoryInfra):
     # is able to cope with the data load generated by TBMv2 metrics.
     return not _IGNORED_STATS_RE.search(value.name)
 
+  def GetExpectations(self):
+    return page_sets.TrivialSitesMemoryStoryExpectations()
+
 
 @benchmark.Enabled('android')  # catapult:#3176
 @benchmark.Owner(emails=['perezju@chromium.org'])
@@ -109,6 +112,9 @@ class MemoryBenchmarkTop10Mobile(_MemoryInfra):
     # is able to cope with the data load generated by TBMv2 metrics.
     return not _IGNORED_STATS_RE.search(value.name)
 
+  def GetExpectations(self):
+    return page_sets.MemoryTop10MobileStoryExpectations()
+
 
 @benchmark.Enabled('android')  # catapult:#3176
 @benchmark.Owner(emails=['bashi@chromium.org'])
@@ -142,6 +148,9 @@ class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
     return (possible_browser.browser_type == 'reference' and
             possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')
 
+  def GetExpectations(self):
+    return page_sets.BlinkMemoryMobileStoryExpectations()
+
 
 class _MemoryV8Benchmark(_MemoryInfra):
 
@@ -193,6 +202,9 @@ class MemoryLongRunningIdleGmail(_MemoryV8Benchmark):
             ((possible_browser.browser_type == 'reference' and
               possible_browser.platform.GetDeviceTypeName() == 'Nexus 5')))
 
+  def GetExpectations(self):
+    return page_sets.LongRunningIdleGmailStoryExpectations()
+
 
 @benchmark.Enabled('has tabs')  # http://crbug.com/612210
 @benchmark.Owner(emails=['ulan@chromium.org'])
@@ -208,3 +220,6 @@ class MemoryLongRunningIdleGmailBackground(_MemoryV8Benchmark):
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/616530
     return cls.IsSvelte(possible_browser)
+
+  def GetExpectations(self):
+    return page_sets.LongRunningIdleGmailBackgroundStoryExpectations()

tools/perf/contrib/memory_extras/memory_extras.py

@@ -34,6 +34,9 @@ class DualBrowserBenchmark(memory._MemoryInfra):
     # is able to cope with the data load generated by TBMv2 metrics.
     return not memory._IGNORED_STATS_RE.search(value.name)
 
+  def GetExpectations(self):
+    return page_sets.DualBrowserStoryExpectations()
+
 
 @benchmark.Owner(emails=['perezju@chromium.org'])
 class LongRunningDualBrowserBenchmark(memory._MemoryInfra):
@@ -63,6 +66,9 @@ class LongRunningDualBrowserBenchmark(memory._MemoryInfra):
     # is able to cope with the data load generated by TBMv2 metrics.
     return not memory._IGNORED_STATS_RE.search(value.name)
 
+  def GetExpectations(self):
+    return page_sets.DualBrowserStoryExpectations()
+
 
 @benchmark.Owner(emails=['etienneb@chromium.org'])
 class LongRunningMemoryBenchmarkSitesDesktop(memory._MemoryInfra):
@@ -90,8 +96,6 @@ class LongRunningMemoryBenchmarkSitesDesktop(memory._MemoryInfra):
     # Disable taking screenshot on failing pages.
     options.take_screenshot_for_failed_page = False
 
-
-
   @classmethod
   def Name(cls):
     return 'memory.long_running_desktop_sites'
@@ -109,3 +113,6 @@ class LongRunningMemoryBenchmarkSitesDesktop(memory._MemoryInfra):
     # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard
     # is able to cope with the data load generated by TBMv2 metrics.
     return not memory._IGNORED_STATS_RE.search(value.name)
+
+  def GetExpectations(self):
+    return page_sets.DesktopMemoryStoryExpectations()

tools/perf/page_sets/blink_memory_mobile.py

@@ -132,3 +132,8 @@ class BlinkMemoryMobilePageSet(story.StorySet):
         'https://plus.google.com/app/basic/110031535020051778989/posts?source=apppromo',
         page_set=self,
         name='GooglePlus'))
+
+
+class BlinkMemoryMobileStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # No tests disabled.

tools/perf/page_sets/desktop_memory.py

@@ -69,3 +69,7 @@ class DesktopMemoryPageSet(story.StorySet):
 
     for url in urls_list:
       self.AddStory(DesktopMemoryPage(url, self))
+
+class DesktopMemoryStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # Not tests disabled.

tools/perf/page_sets/dual_browser_story.py

@@ -257,3 +257,8 @@ class DualBrowserStorySet(story_module.StorySet):
           url=url,
           browser_type='default',
           phase='on_chrome'))
+
+
+class DualBrowserStoryExpectations(story_module.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # No tests disabled.

tools/perf/page_sets/long_running_idle_google_cases.py

@@ -40,6 +40,12 @@ class LongRunningIdleGmailPageSet(story.StorySet):
         _CreateIdlePageClass(google_pages.GmailPage)(self))
 
 
+class LongRunningIdleGmailStoryExpectations(
+    story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # No disaled tests.
+
+
 class LongRunningIdleGmailBackgroundPageSet(story.StorySet):
   def __init__(self):
     # Reuse the wpr of foreground gmail.
@@ -48,3 +54,9 @@ class LongRunningIdleGmailBackgroundPageSet(story.StorySet):
         cloud_storage_bucket=story.PARTNER_BUCKET)
     self.AddStory(
         _CreateIdleBackgroundPageClass(google_pages.GmailPage)(self))
+
+
+class LongRunningIdleGmailBackgroundStoryExpectations(
+    story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # No disaled tests.

tools/perf/page_sets/memory_top_10_mobile.py

@@ -77,3 +77,8 @@ class MemoryTop10Mobile(story.StorySet):
       name = re.sub(r'\W+', '_', url)
       self.AddStory(ForegroundPage(self, name, url))
       self.AddStory(BackgroundPage(self, 'after_' + name))
+
+
+class MemoryTop10MobileStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass  # No tests disabled.

tools/perf/page_sets/trivial_sites.py

@@ -158,3 +158,9 @@ class TrivialSitesStorySet(story.StorySet):
 class TrivialStoryExpectations(story.expectations.StoryExpectations):
   def SetExpectations(self):
     pass # No tests are disabled.
+
+
+class TrivialSitesMemoryStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass # No tests are disabled.
+