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

tools/perf/benchmarks/thread_times.py

Index: tools/perf/benchmarks/thread_times.py
diff --git a/tools/perf/benchmarks/thread_times.py b/tools/perf/benchmarks/thread_times.py
index 65c33a751f90fc0874488a2d8a55601ddc00869e..1ae79c63ffab21240597b640991fa5cb235125cb 100644
--- a/tools/perf/benchmarks/thread_times.py
+++ b/tools/perf/benchmarks/thread_times.py
@@ -1,14 +1,14 @@
 # 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
@@ -16,7 +16,7 @@ class ThreadTimesKeySilkCases(test.Test):
   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'
@@ -34,7 +34,7 @@ class LegacySilkBenchmark(ThreadTimesKeySilkCases):
     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"""
@@ -43,7 +43,7 @@ class ThreadTimesFastPathMobileSites(test.Test):
   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"""
@@ -51,8 +51,8 @@ class ThreadTimesCompositorCases(test.Test):
   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