[Telemetry] Last CL of making enable/disable annotation match old master.cfg.

tools/perf/benchmarks/thread_times.py

 # Copyright 2014 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
 from measurements import thread_times
 import page_sets
 from telemetry import benchmark
 
 
+@benchmark.Enabled('android')
 class ThreadTimesKeySilkCases(benchmark.Benchmark):
   """Measures timeline metrics while performing smoothness action on key silk
   cases."""
   test = thread_times.ThreadTimes
   page_set = page_sets.KeySilkCasesPageSet
   options = {"report_silk_results": True}
 
 
+@benchmark.Enabled('android')
 class ThreadTimesFastPathKeySilkCases(benchmark.Benchmark):
   """Measures timeline metrics while performing smoothness action on key silk
   cases using bleeding edge rendering fast paths."""
   tag = 'fast_path'
   test = thread_times.ThreadTimes
   page_set = page_sets.KeySilkCasesPageSet
   options = {"report_silk_results": True}
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
 @benchmark.Disabled
 class LegacySilkBenchmark(ThreadTimesKeySilkCases):
   """Same as thread_times.key_silk_cases but with the old name."""
   @classmethod
   def GetName(cls):
     return "silk.key_silk_cases"
 
 
+@benchmark.Enabled('android')
 class ThreadTimesFastPathMobileSites(benchmark.Benchmark):
   """Measures timeline metrics while performing smoothness action on
   key mobile sites labeled with fast-path tag.
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   test = thread_times.ThreadTimes
   page_set = page_sets.KeyMobileSitesPageSet
   options = {'page_label_filter' : 'fastpath'}
 
 
 @benchmark.Disabled  # crbug.com/400922
@@ skipping 14 matching lines @@
   def CustomizeBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForSoftwareRasterization(options)
 
 @benchmark.Enabled('android')
 class ThreadTimesPolymer(benchmark.Benchmark):
   """Measures timeline metrics while performing smoothness action on
   Polymer cases."""
   test = thread_times.ThreadTimes
   page_set = page_sets.PolymerPageSet
   options = { 'report_silk_results': True }