[Telemetry] Re-enable disabled startup benchmark.

TBR=charliea@chromium.org

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

tools/perf/benchmarks/start_with_url.py

@@ -31,8 +31,6 @@ class _StartupPerfBenchmark(perf_benchmark.PerfBenchmark):
 
 
 @benchmark.Enabled('has tabs')
-@benchmark.Enabled('android')
-@benchmark.Disabled('chromeos', 'linux', 'mac', 'win')
 @benchmark.Owner(emails=['pasko@chromium.org'])
 class StartWithUrlColdTBM(_StartupPerfBenchmark):
   """Measures time to start Chrome cold with startup URLs."""
@@ -58,9 +56,6 @@ class StartWithUrlColdTBM(_StartupPerfBenchmark):
 
 
 @benchmark.Enabled('has tabs')
-@benchmark.Enabled('android')
-@benchmark.Disabled('android-reference')  # crbug.com/588786
-@benchmark.Disabled('chromeos', 'linux', 'mac', 'win')
 @benchmark.Owner(emails=['pasko@chromium.org'])
 class StartWithUrlWarmTBM(_StartupPerfBenchmark):
   """Measures stimetime to start Chrome warm with startup URLs."""

tools/perf/benchmarks/startup.py

@@ -37,8 +37,6 @@ class _StartupWarm(perf_benchmark.PerfBenchmark):
     return startup.Startup(cold=False)
 
 
-@benchmark.Disabled('snowleopard')  # crbug.com/336913
-@benchmark.Disabled('android')
 class StartupColdBlankPage(_StartupCold):
   """Measures cold startup time with a clean profile."""
   tag = 'cold'
@@ -51,11 +49,11 @@ class StartupColdBlankPage(_StartupCold):
   def GetExpectations(self):
     class StoryExpectations(story.expectations.StoryExpectations):
       def SetExpectations(self):
-        pass # blank_page.html not disabled.
+        self.PermanentlyDisableBenchmark(
+            [story.expectations.ALL_ANDROID], 'Non Android benchmark')
     return StoryExpectations()
 
 
-@benchmark.Disabled('android')
 class StartupWarmBlankPage(_StartupWarm):
   """Measures warm startup time with a clean profile."""
   tag = 'warm'
@@ -65,12 +63,15 @@ class StartupWarmBlankPage(_StartupWarm):
   def Name(cls):
     return 'startup.warm.blank_page'
 
+  def GetExpectations(self):
+    class StoryExpectations(story.expectations.StoryExpectations):
+      def SetExpectations(self):
+        self.PermanentlyDisableBenchmark(
+            [story.expectations.ALL_ANDROID], 'Non Android benchmark')
+    return StoryExpectations()
+
 
-@benchmark.Disabled('reference',                   # http://crbug.com/476882
-                    'android',                     # http://crbug.com/481919
-                    'yosemite',                    # http://crbug.com/605485
-                    'mac',                         # http://crbug.com/700843
-                    'content-shell')               # No pregenerated profiles.
+@benchmark.Disabled('content-shell')  # No pregenerated profiles.
 class StartupLargeProfileColdBlankPage(_StartupCold):
   """Measures cold startup time with a large profile."""
   tag = 'cold'
@@ -94,12 +95,7 @@ class StartupLargeProfileColdBlankPage(_StartupCold):
     return StoryExpectations()
 
 
-@benchmark.Disabled('reference',                   # http://crbug.com/476882
-                    'android',                     # http://crbug.com/481919
-                    'yosemite',                    # http://crbug.com/605485
-                    'mac',                         # http://crbug.com/700843
-                    'win',                         # http://crbug.com/704137
-                    'content-shell')               # No pregenerated profiles.
+@benchmark.Disabled('content-shell')  # No pregenerated profiles.
 class StartupLargeProfileWarmBlankPage(_StartupWarm):
   """Measures warm startup time with a large profile."""
   tag = 'warm'

tools/perf/page_sets/startup_pages.py

@@ -61,11 +61,15 @@ class StartupPagesPageSet(story.StorySet):
 # TODO(rnephew): Test if kapook.com fails on both or just one of the configs.
 class WarmStartupStoryExpectations(story.expectations.StoryExpectations):
   def SetExpectations(self):
+    self.PermanentlyDisableBenchmark(
+        [story.expectations.ALL_DESKTOP], 'Mobile benchmark')
     self.DisableStory(
         'http://kapook.com', [story.expectations.ALL], 'crbug.com/667470')
 
 
 class ColdStartupStoryExpectations(story.expectations.StoryExpectations):
   def SetExpectations(self):
+    self.PermanentlyDisableBenchmark(
+        [story.expectations.ALL_DESKTOP], 'Mobile benchmark')
     self.DisableStory(
         'http://kapook.com', [story.expectations.ALL], 'crbug.com/667470')