Rename telemetry.test.Test to telemetry.benchmark.Benchmark.

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 telemetry import test
+from telemetry import benchmark
 
 from benchmarks import silk_flags
 from measurements import thread_times
 import page_sets
 
 
-class ThreadTimesKeySilkCases(test.Test):
+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}
 
 
-class ThreadTimesFastPathKeySilkCases(test.Test):
+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)
 
 
 class LegacySilkBenchmark(ThreadTimesKeySilkCases):
   """Same as thread_times.key_silk_cases but with the old name."""
   @classmethod
   def GetName(cls):
     return "silk.key_silk_cases"
 
 
-class ThreadTimesFastPathMobileSites(test.Test):
+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'}
 
 
-class ThreadTimesCompositorCases(test.Test):
+class ThreadTimesCompositorCases(benchmark.Benchmark):
   """Measures timeline metrics while performing smoothness action on
   tough compositor cases.
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   test = thread_times.ThreadTimes
   page_set = page_sets.ToughCompositorCasesPageSet
 
 
-@test.Enabled('android')
-class ThreadTimesPolymer(test.Test):
+@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 }