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

tools/perf/benchmarks/smoothness.py

 # 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 benchmarks import silk_flags
 import page_sets
 from measurements import smoothness
 from telemetry import benchmark
 
 
@@ skipping 15 matching lines @@
   test = smoothness.Smoothness
   page_set = page_sets.ToughCanvasCasesPageSet
 
 
 @benchmark.Disabled('android', 'mac', 'win')  # crbug.com/373812
 class SmoothnessToughWebGLCases(benchmark.Benchmark):
   test = smoothness.Smoothness
   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.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   test = smoothness.Smoothness
   page_set = page_sets.KeyMobileSitesPageSet
 
 
 @benchmark.Disabled('android')  # crbug.com/350692
 class SmoothnessToughAnimationCases(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.ToughAnimationCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization
   """
   test = smoothness.Smoothness
   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.
   """
   tag = 'fast_path'
   test = smoothness.Smoothness
   page_set = page_sets.KeySilkCasesPageSet
   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 SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
   """Measures rendering statistics for the top 25 with GPU rasterization
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.Top25PageSet
   def CustomizeBrowserOptions(self, options):
     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
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.KeyMobileSitesPageSet
   def CustomizeBrowserOptions(self, options):
     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
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.KeySilkCasesPageSet
   def CustomizeBrowserOptions(self, options):
     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
   using bleeding edge rendering fast paths.
   """
   tag = 'fast_path_gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.KeySilkCasesPageSet
   def CustomizeBrowserOptions(self, options):
     super(SmoothnessFastPathGpuRasterizationKeySilkCases, self). \
@@ skipping 12 matching lines @@
 
 @benchmark.Enabled('android')
 class SmoothnessToughPinchZoomCases(benchmark.Benchmark):
   """Measures rendering statistics for pinch-zooming into the tough pinch zoom
   cases
   """
   test = smoothness.Smoothness
   page_set = page_sets.ToughPinchZoomCasesPageSet
 
 
+@benchmark.Enabled('android')
 class SmoothnessPolymer(benchmark.Benchmark):
   """Measures rendering statistics for Polymer cases.
   """
   test = smoothness.Smoothness
   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.
   """
   tag = 'fast_path'
   test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
   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
   """
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
   def CustomizeBrowserOptions(self, options):
     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
   using bleeding edge rendering fast paths.
   """
   tag = 'fast_path_gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
   def CustomizeBrowserOptions(self, options):
     super(SmoothnessFastPathGpuRasterizationPolymer, self). \
         CustomizeBrowserOptions(options)
     silk_flags.CustomizeBrowserOptionsForFastPath(options)