[Telemetry] Move thread_timing benchmarks to story expectations.

TBR=charliea@chromium.org

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

tools/perf/benchmarks/thread_times.py

@@ -44,6 +44,9 @@ class ThreadTimesKeySilkCases(_ThreadTimes):
   def Name(cls):
     return 'thread_times.key_silk_cases'
 
+  def GetExpectations(self):
+    return page_sets.KeySilkCasesStoryExpectations()
+
 
 @benchmark.Enabled('android', 'linux')
 class ThreadTimesKeyHitTestCases(_ThreadTimes):
@@ -55,6 +58,9 @@ class ThreadTimesKeyHitTestCases(_ThreadTimes):
   def Name(cls):
     return 'thread_times.key_hit_test_cases'
 
+  def GetExpectations(self):
+    return page_sets.KeyHitTestCasesStoryExpectations()
+
 
 @benchmark.Enabled('android')
 class ThreadTimesFastPathMobileSites(_ThreadTimes):
@@ -68,6 +74,9 @@ class ThreadTimesFastPathMobileSites(_ThreadTimes):
   def Name(cls):
     return 'thread_times.key_mobile_sites_smooth'
 
+  def GetExpectations(self):
+    return page_sets.KeyMobileSitesStoryExpectations()
+
 
 @benchmark.Enabled('android')
 @benchmark.Owner(emails=['vmiura@chromium.org'])
@@ -80,6 +89,9 @@ class ThreadTimesSimpleMobileSites(_ThreadTimes):
   def Name(cls):
     return 'thread_times.simple_mobile_sites'
 
+  def GetExpectations(self):
+    return page_sets.SimpleMobileSitesStoryExpectations()
+
 
 @benchmark.Owner(emails=['vmiura@chromium.org'])
 class ThreadTimesCompositorCases(_ThreadTimes):
@@ -97,6 +109,9 @@ class ThreadTimesCompositorCases(_ThreadTimes):
   def Name(cls):
     return 'thread_times.tough_compositor_cases'
 
+  def GetExpectations(self):
+    return page_sets.ToughCompositorCaseStoryExpectations()
+
 
 @benchmark.Enabled('android')
 @benchmark.Owner(emails=['ykyyip@chromium.org'])
@@ -109,6 +124,9 @@ class ThreadTimesPolymer(_ThreadTimes):
   def Name(cls):
     return 'thread_times.polymer'
 
+  def GetExpectations(self):
+    return page_sets.PolymerThreadTimesStoryExpectations()
+
 
 @benchmark.Enabled('android')
 @benchmark.Owner(emails=['skyostil@chromium.org'])
@@ -126,6 +144,9 @@ class ThreadTimesKeyIdlePowerCases(_ThreadTimes):
     # Only report per-second metrics.
     return 'per_frame' not in value.name and 'mean_frame' not in value.name
 
+  def GetExpectations(self):
+    return page_sets.KeyIdlePowerCasesStoryExpectations()
+
 
 @benchmark.Enabled('android')
 class ThreadTimesKeyNoOpCases(_ThreadTimes):
@@ -142,6 +163,9 @@ class ThreadTimesKeyNoOpCases(_ThreadTimes):
     # Only report per-second metrics.
     return 'per_frame' not in value.name and 'mean_frame' not in value.name
 
+  def GetExpectations(self):
+    return page_sets.KeyNoOpCasesStoryExpectations()
+
 
 @benchmark.Owner(emails=['tdresser@chromium.org'])
 class ThreadTimesToughScrollingCases(_ThreadTimes):
@@ -152,3 +176,6 @@ class ThreadTimesToughScrollingCases(_ThreadTimes):
   @classmethod
   def Name(cls):
     return 'thread_times.tough_scrolling_cases'
+
+  def GetExpectations(self):
+    return page_sets.ToughScrollingCasesStoryExpectations()

tools/perf/page_sets/key_hit_test_cases.py

@@ -43,3 +43,8 @@ class KeyHitTestCasesPageSet(story.StorySet):
     super(KeyHitTestCasesPageSet, self).__init__()
 
     self.AddStory(PaperCalculatorHitTest(self))
+
+
+class KeyHitTestCasesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass

tools/perf/page_sets/key_idle_power_cases.py

@@ -85,3 +85,8 @@ class KeyIdlePowerCasesPageSet(story.StorySet):
     # Why: Ensure that activity strictly diminishes the longer the idle time.
     self.AddStory(KeyLongIdlePowerPage(
         'file://key_idle_power_cases/set-timeout.html', self, True))
+
+
+class KeyIdlePowerCasesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass

tools/perf/page_sets/key_noop_cases.py

@@ -60,3 +60,8 @@ class KeyNoOpCasesPageSet(story.StorySet):
     # Why: Feeding a stream of touch events to a no-op handler should be cheap.
     self.AddStory(NoOpTouchScrollPage(
         'file://key_noop_cases/no_op_touch_handler.html', self))
+
+
+class KeyNoOpCasesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass

tools/perf/page_sets/polymer.py

@@ -266,3 +266,8 @@ class PolymerPageSet(story.StorySet):
 class PolymerRasterizeAndRecordStoryExpectations(story.expectations.StoryExpectations):
   def SetExpectations(self):
     pass # No tests disabled.
+
+
+class PolymerThreadTimesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass # No tests disabled.

tools/perf/page_sets/simple_mobile_sites.py

@@ -31,8 +31,8 @@ class SimpleScrollPage(SimplePage):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage(direction='down', speed_in_pixels_per_second=300)
 
-class SimpleMobileSitesPageSet(story.StorySet):
 
+class SimpleMobileSitesPageSet(story.StorySet):
   """ Simple mobile sites """
 
   def __init__(self):
@@ -52,3 +52,7 @@ class SimpleMobileSitesPageSet(story.StorySet):
     for url in scroll_page_list:
       self.AddStory(SimpleScrollPage(url, self))
 
+
+class SimpleMobileSitesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass

tools/perf/page_sets/tough_compositor_cases.py

@@ -77,3 +77,9 @@ class ToughCompositorCasesPageSet(story.StorySet):
 
     for url in wait_urls_list:
       self.AddStory(ToughCompositorWaitPage(url, self))
+
+
+class ToughCompositorCaseStoryExpectations(
+    story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass

tools/perf/page_sets/tough_scrolling_cases.py

@@ -55,3 +55,7 @@ class ToughScrollingCasesPageSet(story.StorySet):
           speed,
           self,
           synthetic_gesture_source))
+
+class ToughScrollingCasesStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass