[Telemetry] Make several more enable/disables match old master.cfg file.

BUG=388885

Review URL: https://codereview.chromium.org/587833003

Cr-Commit-Position: refs/heads/master@{#295814}

tools/perf/benchmarks/page_cycler.py

@@ -85,13 +85,14 @@ class PageCyclerNetsimTop10(benchmark.Benchmark):
     self.test.clear_cache_before_each_run = True
 
 
+@benchmark.Enabled('android')
 class PageCyclerTop10Mobile(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.Top10MobilePageSet
   options = {'pageset_repeat': 10}
 
 
-@benchmark.Disabled('android')
+@benchmark.Disabled
 class PageCyclerKeyMobileSites(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.KeyMobileSitesPageSet

tools/perf/benchmarks/polymer_load.py

@@ -7,12 +7,14 @@ import page_sets
 from telemetry import benchmark
 
 
+@benchmark.Enabled('android')
 class PolymerLoadPica(benchmark.Benchmark):
   """Measures time to polymer-ready for Pica (News Reader)."""
   test = polymer_load.PolymerLoadMeasurement
   page_set = page_sets.PicaPageSet
 
 
+@benchmark.Enabled('android')
 class PolymerLoadTopeka(benchmark.Benchmark):
   """Measures time to polymer-ready for Topeka (Quiz App)."""
   test = polymer_load.PolymerLoadMeasurement

tools/perf/benchmarks/repaint.py

@@ -8,6 +8,7 @@ import page_sets
 from telemetry import benchmark
 
 
+@benchmark.Enabled('android')
 class RepaintKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites.
 
@@ -16,7 +17,7 @@ class RepaintKeyMobileSites(benchmark.Benchmark):
   page_set = page_sets.KeyMobileSitesPageSet
 
 
-@benchmark.Disabled('android')  # crbug.com/412001
+@benchmark.Disabled  # crbug.com/412001
 class RepaintGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites with forced GPU
   rasterization.

tools/perf/benchmarks/smoothness.py

@@ -33,11 +33,13 @@ class SmoothnessToughWebGLCases(benchmark.Benchmark):
   page_set = page_sets.ToughWebglCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessMaps(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.MapsPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessKeyMobileSites(benchmark.Benchmark):
   """Measures rendering statistics while scrolling down the key mobile sites.
 
@@ -52,6 +54,7 @@ class SmoothnessToughAnimationCases(benchmark.Benchmark):
   page_set = page_sets.ToughAnimationCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization
@@ -60,6 +63,7 @@ class SmoothnessKeySilkCases(benchmark.Benchmark):
   page_set = page_sets.KeySilkCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessFastPathKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization using bleeding edge rendering fast paths.
@@ -71,8 +75,7 @@ class SmoothnessFastPathKeySilkCases(benchmark.Benchmark):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
-# GPU rasterization does not work on J devices
-@benchmark.Disabled('j', 'android')  # crbug.com/399125
+@benchmark.Enabled('android')  # crbug.com/399125
 class SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
   """Measures rendering statistics for the top 25 with GPU rasterization
   """
@@ -83,8 +86,7 @@ class SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-# GPU rasterization does not work on J devices
-@benchmark.Disabled('j', 'android')  # crbug.com/399125
+@benchmark.Enabled('android')  # crbug.com/399125
 class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   """Measures rendering statistics for the key mobile sites with GPU
   rasterization
@@ -96,7 +98,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@benchmark.Disabled('android')  # crbug.com/399125
+@benchmark.Disabled  # crbug.com/399125
 class SmoothnessGpuRasterizationKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases with GPU rasterization
   """
@@ -107,7 +109,7 @@ class SmoothnessGpuRasterizationKeySilkCases(benchmark.Benchmark):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@benchmark.Disabled('android')  # crbug.com/399125
+@benchmark.Disabled  # crbug.com/399125
 class SmoothnessFastPathGpuRasterizationKeySilkCases(
     SmoothnessGpuRasterizationKeySilkCases):
   """Measures rendering statistics for the key silk cases with GPU rasterization
@@ -140,6 +142,7 @@ class SmoothnessToughPinchZoomCases(benchmark.Benchmark):
   page_set = page_sets.ToughPinchZoomCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessPolymer(benchmark.Benchmark):
   """Measures rendering statistics for Polymer cases.
   """
@@ -147,6 +150,7 @@ class SmoothnessPolymer(benchmark.Benchmark):
   page_set = page_sets.PolymerPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessFastPathPolymer(benchmark.Benchmark):
   """Measures rendering statistics for the Polymer cases without GPU
   rasterization using bleeding edge rendering fast paths.
@@ -157,8 +161,7 @@ class SmoothnessFastPathPolymer(benchmark.Benchmark):
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
-# GPU rasterization does not work on J devices
-@benchmark.Disabled('j', 'android')  # crbug.com/399125
+@benchmark.Enabled('android')  # crbug.com/399125
 class SmoothnessGpuRasterizationPolymer(benchmark.Benchmark):
   """Measures rendering statistics for the Polymer cases with GPU rasterization
   """
@@ -169,7 +172,7 @@ class SmoothnessGpuRasterizationPolymer(benchmark.Benchmark):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@benchmark.Disabled('android')  # crbug.com/399125
+@benchmark.Disabled  # crbug.com/399125
 class SmoothnessFastPathGpuRasterizationPolymer(
     SmoothnessGpuRasterizationPolymer):
   """Measures rendering statistics for the Polymer cases with GPU rasterization