[Telemetry] Make our Enabled/Disabled annotations match what the bots run.

tools/perf/benchmarks/startup.py

Index: tools/perf/benchmarks/startup.py
diff --git a/tools/perf/benchmarks/startup.py b/tools/perf/benchmarks/startup.py
index c8372fc10d85e14c16e81b67cbecfb37efa01ac0..749427ca502170f16d8c348e77f0b51253a831bd 100644
--- a/tools/perf/benchmarks/startup.py
+++ b/tools/perf/benchmarks/startup.py
@@ -1,13 +1,13 @@
 # Copyright 2013 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.
-from telemetry import benchmark
 
 from measurements import startup
 import page_sets
+from telemetry import benchmark
 
 
-@benchmark.Disabled('snowleopard') # crbug.com/336913
+@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
 class StartupColdBlankPage(benchmark.Benchmark):
   tag = 'cold'
   test = startup.Startup
@@ -16,6 +16,7 @@ class StartupColdBlankPage(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
+@benchmark.Enabled('has tabs')
 class StartupWarmBlankPage(benchmark.Benchmark):
   tag = 'warm'
   test = startup.Startup
@@ -23,7 +24,8 @@ class StartupWarmBlankPage(benchmark.Benchmark):
   options = {'warm': True,
              'pageset_repeat': 20}
 
-@benchmark.Disabled('snowleopard') # crbug.com/336913
+
+@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
 class StartupColdTheme(benchmark.Benchmark):
   tag = 'theme_cold'
   test = startup.Startup
@@ -33,6 +35,7 @@ class StartupColdTheme(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
+@benchmark.Disabled('android')
 class StartupWarmTheme(benchmark.Benchmark):
   tag = 'theme_warm'
   test = startup.Startup
@@ -41,7 +44,8 @@ class StartupWarmTheme(benchmark.Benchmark):
   options = {'warm': True,
              'pageset_repeat': 20}
 
-@benchmark.Disabled('snowleopard') # crbug.com/336913
+
+@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
 class StartupColdManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_cold'
   test = startup.Startup
@@ -51,6 +55,7 @@ class StartupColdManyExtensions(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
+@benchmark.Disabled('android')
 class StartupWarmManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_warm'
   test = startup.Startup