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

tools/perf/benchmarks/media.py

Index: tools/perf/benchmarks/media.py
diff --git a/tools/perf/benchmarks/media.py b/tools/perf/benchmarks/media.py
index a5edabd938ec96ab1c1ebc8c7d1164b7ea84d7e2..8520468e3efe826cd1a067980d9b7dd831c2f136 100644
--- a/tools/perf/benchmarks/media.py
+++ b/tools/perf/benchmarks/media.py
@@ -4,7 +4,7 @@
 
 from measurements import media
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
@@ -29,19 +29,19 @@ class _MSEMeasurement(page_measurement.PageMeasurement):
                 value=float(metrics[m]), important=True))
 
 
-class Media(test.Test):
+class Media(benchmark.Benchmark):
   """Obtains media metrics for key user scenarios."""
   test = media.Media
   page_set = page_sets.ToughVideoCasesPageSet
 
 
-class MediaNetworkSimulation(test.Test):
+class MediaNetworkSimulation(benchmark.Benchmark):
   """Obtains media metrics under different network simulations."""
   test = media.Media
   page_set = page_sets.MediaCnsCasesPageSet
 
 
-class MediaAndroid(test.Test):
+class MediaAndroid(benchmark.Benchmark):
   """Obtains media metrics for key user scenarios on Android."""
   test = media.Media
   tag = 'android'
@@ -50,7 +50,7 @@ class MediaAndroid(test.Test):
   options = {'page_label_filter_exclude': 'is_4k,is_50fps'}
 
 
-class MediaChromeOS4kOnly(test.Test):
+class MediaChromeOS4kOnly(benchmark.Benchmark):
   """Benchmark for media performance on ChromeOS using only is_4k test content.
   """
   test = media.Media
@@ -63,7 +63,7 @@ class MediaChromeOS4kOnly(test.Test):
   }
 
 
-class MediaChromeOS(test.Test):
+class MediaChromeOS(benchmark.Benchmark):
   """Benchmark for media performance on all ChromeOS platforms.
 
   This benchmark does not run is_4k content, there's a separate benchmark for
@@ -76,7 +76,7 @@ class MediaChromeOS(test.Test):
   options = {'page_label_filter_exclude': 'is_4k,is_50fps'}
 
 
-class MediaSourceExtensions(test.Test):
+class MediaSourceExtensions(benchmark.Benchmark):
   """Obtains media metrics for key media source extensions functions."""
   test = _MSEMeasurement
   page_set = page_sets.MseCasesPageSet