re-enable startup benchmarks on Android

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 749427ca502170f16d8c348e77f0b51253a831bd..459617fd8dc79761399f4e768986d1e06f6eda88 100644
--- a/tools/perf/benchmarks/startup.py
+++ b/tools/perf/benchmarks/startup.py
@@ -7,7 +7,7 @@ import page_sets
 from telemetry import benchmark
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
+@benchmark.Disabled('snowleopard') # crbug.com/336913

[tonyg, 2014/07/17 14:29:22]

Does this benchmark open multiple tabs? If so, it needs to retain an
@benchmark.Enabled('has tabs').

[pasko, 2014/07/18 12:37:02]

I think it does not open multiple tabs, it's a blank page startup after all.

It's hard to me to read the magic in the decorator code, is there any
document/comment/helpmessage explaining what arguments for @benchmark.Enabled
are supported and what effect they cause? can I have bothe @benchmark.Enable and
@benchmark.Disable decorators for one method? Is a native New-Tab-Page on
Android considered a tab in the sense of Enabled('has tabs')?

 class StartupColdBlankPage(benchmark.Benchmark):
   tag = 'cold'
   test = startup.Startup
@@ -25,7 +25,7 @@ class StartupWarmBlankPage(benchmark.Benchmark):
              'pageset_repeat': 20}
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913

[tonyg, 2014/07/17 14:29:22]

Chrome on android doesn't support themes or extensions. Why would it run the
below 4?

[pasko, 2014/07/18 12:37:02]

sorry, that was mechanical, Undone.

+@benchmark.Disabled('snowleopard') # crbug.com/336913
 class StartupColdTheme(benchmark.Benchmark):
   tag = 'theme_cold'
   test = startup.Startup
@@ -35,7 +35,6 @@ class StartupColdTheme(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
-@benchmark.Disabled('android')
 class StartupWarmTheme(benchmark.Benchmark):
   tag = 'theme_warm'
   test = startup.Startup
@@ -45,7 +44,7 @@ class StartupWarmTheme(benchmark.Benchmark):
              'pageset_repeat': 20}
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
+@benchmark.Disabled('snowleopard') # crbug.com/336913
 class StartupColdManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_cold'
   test = startup.Startup
@@ -55,7 +54,6 @@ class StartupColdManyExtensions(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
-@benchmark.Disabled('android')
 class StartupWarmManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_warm'
   test = startup.Startup