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

tools/perf/benchmarks/rasterize_and_record_micro.py

Index: tools/perf/benchmarks/rasterize_and_record_micro.py
diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
index f0dd5315fa45907e71d6f71794d7250d60e16efd..7ced8fa9431a4bdead668723b8d8958b34a4b917 100644
--- a/tools/perf/benchmarks/rasterize_and_record_micro.py
+++ b/tools/perf/benchmarks/rasterize_and_record_micro.py
@@ -5,13 +5,13 @@
 from benchmarks import silk_flags
 from measurements import rasterize_and_record_micro
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 
 
 # RasterizeAndRecord disabled on mac because of crbug.com/350684.
 # RasterizeAndRecord disabled on windows because of crbug.com/338057.
-@test.Disabled('mac', 'win')
-class RasterizeAndRecordMicroTop25(test.Test):
+@benchmark.Disabled('mac', 'win')
+class RasterizeAndRecordMicroTop25(benchmark.Benchmark):
   """Measures rasterize and record performance on the top 25 web pages.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -19,8 +19,8 @@ class RasterizeAndRecordMicroTop25(test.Test):
   page_set = page_sets.Top25PageSet
 
 
-@test.Disabled('mac', 'win')
-class RasterizeAndRecordMicroKeyMobileSites(test.Test):
+@benchmark.Disabled('mac', 'win')
+class RasterizeAndRecordMicroKeyMobileSites(benchmark.Benchmark):
   """Measures rasterize and record performance on the key mobile sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -28,8 +28,8 @@ class RasterizeAndRecordMicroKeyMobileSites(test.Test):
   page_set = page_sets.KeyMobileSitesPageSet
 
 
-@test.Disabled('mac', 'win')
-class RasterizeAndRecordMicroKeySilkCases(test.Test):
+@benchmark.Disabled('mac', 'win')
+class RasterizeAndRecordMicroKeySilkCases(benchmark.Benchmark):
   """Measures rasterize and record performance on the silk sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -37,8 +37,9 @@ class RasterizeAndRecordMicroKeySilkCases(test.Test):
   page_set = page_sets.KeySilkCasesPageSet
 
 
-@test.Disabled('mac', 'win')
-class RasterizeAndRecordMicroFastPathGpuRasterizationKeySilkCases(test.Test):
+@benchmark.Disabled('mac', 'win')
+class RasterizeAndRecordMicroFastPathGpuRasterizationKeySilkCases(
+    benchmark.Benchmark):
   """Measures rasterize and record performance on the silk sites.
 
   Uses GPU rasterization together with bleeding edge rendering fast paths.
@@ -52,8 +53,8 @@ class RasterizeAndRecordMicroFastPathGpuRasterizationKeySilkCases(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@test.Enabled('android')
-class RasterizeAndRecordMicroPolymer(test.Test):
+@benchmark.Enabled('android')
+class RasterizeAndRecordMicroPolymer(benchmark.Benchmark):
   """Measures rasterize and record performance on the Polymer cases.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""