[Telemetry] Move storage, octane, oort, service_worker, and speedomet…

…er benchmarks to story expectations.

TBR=charliea@chromium.org

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

tools/perf/benchmarks/indexeddb_perf.py

@@ -99,6 +99,9 @@ class IndexedDbOriginalSectioned(perf_benchmark.PerfBenchmark):
   def Name(cls):
     return 'storage.indexeddb_endure'
 
+  def GetExpectations(self):
+    return page_sets.IndexedDBEndureStoryExpectations()
+
 
 @benchmark.Disabled('linux') # crbug.com/677972
 @benchmark.Owner(emails=['cmumford@chromium.org'])
@@ -121,3 +124,6 @@ def Name(cls):
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
     return 'idb' in value.name
+
+  def GetExpectations(self):
+    return page_sets.IndexedDBEndureStoryExpectations()

tools/perf/benchmarks/octane.py

@@ -154,3 +154,9 @@ def CreateStorySet(self, options):
         ps, ps.base_dir, make_javascript_deterministic=False,
         name='http://chromium.github.io/octane/index.html?auto=1'))
     return ps
+
+  def GetExpectations(self):
+    class StoryExpectations(story.expectations.StoryExpectations):
+      def SetExpectations(self):
+        pass # Octane not disabled.
+    return StoryExpectations()

tools/perf/benchmarks/oortonline.py

@@ -8,6 +8,7 @@
 
 from core import perf_benchmark
 from telemetry import benchmark
+from telemetry import story
 from telemetry.page import legacy_page_test
 from telemetry.value import scalar
 from telemetry.value import improvement_direction
@@ -49,6 +50,11 @@ def Name(cls):
   def CreateStorySet(self, options):
     return page_sets.OortOnlinePageSet()
 
+  def GetExpectations(self):
+    class StoryExpectations(story.expectations.StoryExpectations):
+      def SetExpectations(self):
+        pass # http://oortonline.gl/#run not disabled.
+    return StoryExpectations()
 
 # Disabled on Linux due to timeouts; crbug.com/727850
 @benchmark.Disabled('linux', 'win')
@@ -67,6 +73,12 @@ class OortOnlineTBMv2(perf_benchmark.PerfBenchmark):
 
   page_set = page_sets.OortOnlineTBMPageSet
 
+  def GetExpectations(self):
+    class StoryExpectations(story.expectations.StoryExpectations):
+      def SetExpectations(self):
+        pass # http://oortonline.gl/#run not disabled.
+    return StoryExpectations()
+
   def CreateTimelineBasedMeasurementOptions(self):
     categories = [
       # Implicitly disable all categories.

tools/perf/benchmarks/service_worker.py

@@ -174,6 +174,9 @@ class ServiceWorkerPerfTest(perf_benchmark.PerfBenchmark):
   def Name(cls):
     return 'service_worker.service_worker'
 
+  def GetExpectations(self):
+    return page_sets.ServiceWorkerStoryExpectations()
+
 
 @benchmark.Disabled('android-webview')  # http://crbug.com/653924
 @benchmark.Owner(emails=['horo@chromium.org'])
@@ -195,3 +198,6 @@ def Name(cls):
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/597656
       return (possible_browser.browser_type == 'reference' and
               possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')
+
+  def GetExpectations(self):
+    return page_sets.ServiceWorkerMicroBenchmarksStoryExpectations()

tools/perf/benchmarks/speedometer.py

@@ -107,3 +107,9 @@ def CreateStorySet(self, options):
         make_javascript_deterministic=False,
         name='http://browserbench.org/Speedometer/'))
     return ps
+
+  def GetExpectations(self):
+    class StoryExpectations(story.expectations.StoryExpectations):
+      def SetExpectations(self):
+        pass # http://browserbench.org/Speedometer/ not disabled.
+    return StoryExpectations()

tools/perf/page_sets/indexeddb_endure_page.py

@@ -45,3 +45,8 @@ def __init__(self):
     ]
     for test in tests:
       self.AddStory(IndexedDBEndurePage(test, self))
+
+
+class IndexedDBEndureStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass # Nothing disabled.

tools/perf/page_sets/oortonline.py

@@ -68,6 +68,7 @@ def RunPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('End'):
       action_runner.tab.browser.DumpMemory()
 
+
 class OortOnlineTBMPageSet(story.StorySet):
   """Oort Online WebGL benchmark for TBM.
   URL: http://oortonline.gl/#run

tools/perf/page_sets/service_worker.py

@@ -40,3 +40,8 @@ def __init__(self):
     self.AddStory(page.Page(
         'https://jakearchibald.github.io/svgomg/', self,
         name='svgomg_second_load', make_javascript_deterministic=False))
+
+
+class ServiceWorkerStoryExpectations(story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass # Nothing disabled.

tools/perf/page_sets/service_worker_micro_benchmark.py

@@ -33,3 +33,8 @@ def __init__(self):
         'http://localhost:8091/index.html', self,
         make_javascript_deterministic=False,
         name='http://localhost:8091/index.html'))
+
+class ServiceWorkerMicroBenchmarksStoryExpectations(
+    story.expectations.StoryExpectations):
+  def SetExpectations(self):
+    pass # Nothing disabled.