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

BUG=383629

Review URL: https://codereview.chromium.org/337603005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280332 0039d316-1c4b-4281-b951-d872f2087c98

39 files changed, 193 insertions, 192 deletions

diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py
index a46b32a..196c15b 100644
--- a/tools/perf/benchmarks/benchmark_unittest.py
+++ b/tools/perf/benchmarks/benchmark_unittest.py
@@ -11,7 +11,7 @@ kind of smoke test.
 import os
 import unittest
 
-from telemetry import test
+from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.page import page_measurement
 from telemetry.unittest import gtest_unittest_results
@@ -19,10 +19,10 @@ from telemetry.unittest import options_for_unittests
 
 
 def SmokeTestGenerator(benchmark):
-  # In general you should @test.Disabled individual benchmarks that fail,
-  # instead of this entire smoke test suite.
+  # In general you should @benchmark_module.Disabled individual benchmarks that
+  # fail, instead of this entire smoke test suite.
   # TODO(achuith): Multiple tests failing on CrOS. crbug.com/351114
-  @test.Disabled('chromeos')
+  @benchmark_module.Disabled('chromeos')
   def BenchmarkSmokeTest(self):
     # Only measure a single page so that this test cycles reasonably quickly.
     benchmark.options['pageset_repeat'] = 1
@@ -41,12 +41,12 @@ def SmokeTestGenerator(benchmark):
     parser = options.CreateParser()
 
     benchmark.AddCommandLineArgs(parser)
-    test.AddCommandLineArgs(parser)
+    benchmark_module.AddCommandLineArgs(parser)
     benchmark.SetArgumentDefaults(parser)
     options.MergeDefaultValues(parser.get_default_values())
 
     benchmark.ProcessCommandLineArgs(None, options)
-    test.ProcessCommandLineArgs(None, options)
+    benchmark_module.ProcessCommandLineArgs(None, options)
 
     self.assertEqual(0, SinglePageBenchmark().Run(options),
                      msg='Failed: %s' % benchmark)
@@ -65,8 +65,8 @@ def load_tests(_, _2, _3):
       measurements_dir, top_level_dir, page_measurement.PageMeasurement,
       pattern='*.py').values()
   all_benchmarks = discover.DiscoverClasses(
-      benchmarks_dir, top_level_dir, test.Test, pattern='*.py').values()
-
+      benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
+      pattern='*.py').values()
   for benchmark in all_benchmarks:
     if benchmark.PageTestClass() not in all_measurements:
       # If the benchmark is not in measurements, then it is not composable.
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index ae38e48..27692bb 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -4,7 +4,7 @@
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
@@ -93,7 +93,7 @@ class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
     print log
 
 
-class BlinkPerfAll(test.Test):
+class BlinkPerfAll(benchmark.Benchmark):
   tag = 'all'
   test = _BlinkPerfMeasurement
 
@@ -102,7 +102,7 @@ class BlinkPerfAll(test.Test):
         'third_party', 'WebKit', 'PerformanceTests')
     return _CreatePageSetFromPath(path)
 
-class BlinkPerfAnimation(test.Test):
+class BlinkPerfAnimation(benchmark.Benchmark):
   tag = 'animation'
   test = _BlinkPerfMeasurement
 
diff --git a/tools/perf/benchmarks/browsermark.py b/tools/perf/benchmarks/browsermark.py
index 85953af..ebf7c11 100644
--- a/tools/perf/benchmarks/browsermark.py
+++ b/tools/perf/benchmarks/browsermark.py
@@ -20,7 +20,7 @@ tests are not included in this suite.
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -44,7 +44,7 @@ class _BrowsermarkMeasurement(page_measurement.PageMeasurement):
     results.Add('Score', 'score', result)
 
 
-class Browsermark(test.Test):
+class Browsermark(benchmark.Benchmark):
   """Browsermark suite tests CSS, DOM, resize, page load, WebGL and JS."""
   test = _BrowsermarkMeasurement
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/canvasmark.py b/tools/perf/benchmarks/canvasmark.py
index f846101..5e2cec02 100644
--- a/tools/perf/benchmarks/canvasmark.py
+++ b/tools/perf/benchmarks/canvasmark.py
@@ -11,7 +11,7 @@ fills, shadows and text functions.
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -46,7 +46,7 @@ class _CanvasMarkMeasurement(page_measurement.PageMeasurement):
     results.Add('Score', 'score', total)
 
 
-class CanvasMark(test.Test):
+class CanvasMark(benchmark.Benchmark):
   test = _CanvasMarkMeasurement
 
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/chrome_proxy.py b/tools/perf/benchmarks/chrome_proxy.py
index 9e79299..a42b265 100644
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ b/tools/perf/benchmarks/chrome_proxy.py
@@ -2,13 +2,13 @@
 # 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 measurements import chrome_proxy
 import page_sets
 
 
-class ChromeProxyLatency(test.Test):
+class ChromeProxyLatency(benchmark.Benchmark):
   tag = 'latency'
   test = chrome_proxy.ChromeProxyLatency
   page_set = page_sets.Top20PageSet
@@ -18,7 +18,7 @@ class ChromeProxyLatency(test.Test):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-class ChromeProxyLatencyDirect(test.Test):
+class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = chrome_proxy.ChromeProxyLatency
   page_set = page_sets.Top20PageSet
@@ -33,7 +33,7 @@ class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyDataSaving(test.Test):
+class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = chrome_proxy.ChromeProxyDataSaving
   page_set = page_sets.Top20PageSet
@@ -42,7 +42,7 @@ class ChromeProxyDataSaving(test.Test):
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
 
-class ChromeProxyDataSavingDirect(test.Test):
+class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = chrome_proxy.ChromeProxyDataSaving
   page_set = page_sets.Top20PageSet
@@ -57,37 +57,37 @@ class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyHeaderValidation(test.Test):
+class ChromeProxyHeaderValidation(benchmark.Benchmark):
   tag = 'header_validation'
   test = chrome_proxy.ChromeProxyHeaders
   page_set = page_sets.Top20PageSet
 
 
-class ChromeProxyBypass(test.Test):
+class ChromeProxyBypass(benchmark.Benchmark):
   tag = 'bypass'
   test = chrome_proxy.ChromeProxyBypass
   page_set = page_sets.BypassPageSet
 
 
-class ChromeProxySafeBrowsing(test.Test):
+class ChromeProxySafeBrowsing(benchmark.Benchmark):
   tag = 'safebrowsing'
   test = chrome_proxy.ChromeProxySafebrowsing
   page_set = page_sets.SafebrowsingPageSet
 
 
-class ChromeProxyHTTPFallbackProbeURL(test.Test):
+class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
   tag = 'fallback-probe'
   test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
   page_set = page_sets.SyntheticPageSet
 
 
-class ChromeProxyHTTPFallbackViaHeader(test.Test):
+class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
   tag = 'fallback-viaheader'
   test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
   page_set = page_sets.FallbackViaHeaderPageSet
 
 
-class ChromeProxySmoke(test.Test):
+class ChromeProxySmoke(benchmark.Benchmark):
   tag = 'smoke'
   test = chrome_proxy.ChromeProxySmoke
   page_set = page_sets.SmokePageSet
diff --git a/tools/perf/benchmarks/dom_perf.py b/tools/perf/benchmarks/dom_perf.py
index b3d8735..b16047a 100644
--- a/tools/perf/benchmarks/dom_perf.py
+++ b/tools/perf/benchmarks/dom_perf.py
@@ -6,7 +6,7 @@ import json
 import math
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
@@ -69,8 +69,8 @@ class _DomPerfMeasurement(page_measurement.PageMeasurement):
                            total))
 
 
-@test.Disabled('android', 'linux')
-class DomPerf(test.Test):
+@benchmark.Disabled('android', 'linux')
+class DomPerf(benchmark.Benchmark):
   """A suite of JavaScript benchmarks for exercising the browser's DOM.
 
   The final score is computed as the geometric mean of the individual results.
diff --git a/tools/perf/benchmarks/dromaeo.py b/tools/perf/benchmarks/dromaeo.py
index 775c9fe..7d0c8b2 100644
--- a/tools/perf/benchmarks/dromaeo.py
+++ b/tools/perf/benchmarks/dromaeo.py
@@ -6,7 +6,7 @@ import math
 import os
 
 from metrics import power
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -86,7 +86,7 @@ class _DromaeoMeasurement(page_measurement.PageMeasurement):
     for key, value in aggregated.iteritems():
       AddResult(key, math.exp(value['sum'] / value['count']))
 
-class _DromaeoBenchmark(test.Test):
+class _DromaeoBenchmark(benchmark.Benchmark):
   """A base class for Dromaeo benchmarks."""
   test = _DromaeoMeasurement
 
@@ -112,7 +112,7 @@ class DromaeoDomCoreAttr(_DromaeoBenchmark):
   query_param = 'dom-attr'
 
 
-@test.Disabled('xp')  # crbug.com/323782
+@benchmark.Disabled('xp')  # crbug.com/323782
 class DromaeoDomCoreModify(_DromaeoBenchmark):
   """Dromaeo DOMCore modify JavaScript benchmark."""
   tag = 'domcoremodify'
diff --git a/tools/perf/benchmarks/endure.py b/tools/perf/benchmarks/endure.py
index f8194a8..d719b53 100644
--- a/tools/perf/benchmarks/endure.py
+++ b/tools/perf/benchmarks/endure.py
@@ -10,13 +10,13 @@ page sets, and the statistics that are gathered are determined by the Endure
 measurement class.
 """
 
-from telemetry import test
+from telemetry import benchmark
 
 from measurements import endure
 import page_sets
 
 
-class _EndureBenchmark(test.Test):
+class _EndureBenchmark(benchmark.Benchmark):
   """Base class which sets options for endure benchmarks below."""
   test = endure.Endure
   # Default options for endure benchmarks. Could be overridden in subclasses.
diff --git a/tools/perf/benchmarks/html5gaming.py b/tools/perf/benchmarks/html5gaming.py
index 98370b0..891703f 100644
--- a/tools/perf/benchmarks/html5gaming.py
+++ b/tools/perf/benchmarks/html5gaming.py
@@ -12,7 +12,7 @@ score is a indicator for the browser's ability to smoothly run HTML5 games."""
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -28,7 +28,7 @@ class _HTML5GamingMeasurement(page_measurement.PageMeasurement):
     results.Add('Score', 'score', result)
 
 
-class HTML5Gaming(test.Test):
+class HTML5Gaming(benchmark.Benchmark):
   """Imapct HTML5 smooth running games benchmark suite."""
   test = _HTML5GamingMeasurement
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/image_decoding.py b/tools/perf/benchmarks/image_decoding.py
index 6e9f777..ae286b6 100644
--- a/tools/perf/benchmarks/image_decoding.py
+++ b/tools/perf/benchmarks/image_decoding.py
@@ -2,13 +2,13 @@
 # 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 measurements import image_decoding
 import page_sets
 
 
-class ImageDecodingToughImageCases(test.Test):
+class ImageDecodingToughImageCases(benchmark.Benchmark):
   test = image_decoding.ImageDecoding
   # TODO: Rename this page set to tough_image_cases.py
   page_set = page_sets.ImageDecodingMeasurementPageSet
diff --git a/tools/perf/benchmarks/indexeddb_perf.py b/tools/perf/benchmarks/indexeddb_perf.py
index 5949f36..cad569b 100644
--- a/tools/perf/benchmarks/indexeddb_perf.py
+++ b/tools/perf/benchmarks/indexeddb_perf.py
@@ -25,7 +25,7 @@ import os
 from metrics import memory
 from metrics import power
 from metrics import v8_object_stats
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
@@ -81,7 +81,7 @@ class _IndexedDbMeasurement(page_measurement.PageMeasurement):
     power.PowerMetric.CustomizeBrowserOptions(options)
     v8_object_stats.V8ObjectStatsMetric.CustomizeBrowserOptions(options)
 
-class IndexedDb(test.Test):
+class IndexedDb(benchmark.Benchmark):
   """Chromium's IndexedDB Performance tests."""
   test = _IndexedDbMeasurement
 
diff --git a/tools/perf/benchmarks/jetstream.py b/tools/perf/benchmarks/jetstream.py
index 2e935df..98c4349 100644
--- a/tools/perf/benchmarks/jetstream.py
+++ b/tools/perf/benchmarks/jetstream.py
@@ -20,7 +20,7 @@ specialized optimization for one benchmark might make another benchmark slower.
 import json
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 from telemetry.util import statistics
@@ -69,8 +69,8 @@ class _JetstreamMeasurement(page_measurement.PageMeasurement):
         scalar.ScalarValue(None, 'Score', 'score', total))
 
 
-@test.Disabled('android', 'xp')  # crbug.com/381742
-class Jetstream(test.Test):
+@benchmark.Disabled('android', 'xp')  # crbug.com/381742
+class Jetstream(benchmark.Benchmark):
   test = _JetstreamMeasurement
 
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/jsgamebench.py b/tools/perf/benchmarks/jsgamebench.py
index 762e8ba..8d1c8c1 100644
--- a/tools/perf/benchmarks/jsgamebench.py
+++ b/tools/perf/benchmarks/jsgamebench.py
@@ -12,7 +12,7 @@ The benchmark is kept here for historical purposes but is disabled on the bots.
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -31,8 +31,8 @@ class _JsgamebenchMeasurement(page_measurement.PageMeasurement):
     results.Add('Score', 'score (bigger is better)', result)
 
 
-@test.Disabled
-class Jsgamebench(test.Test):
+@benchmark.Disabled
+class Jsgamebench(benchmark.Benchmark):
   """Counts how many animating sprites can move around on the screen at once."""
   test = _JsgamebenchMeasurement
 
diff --git a/tools/perf/benchmarks/kraken.py b/tools/perf/benchmarks/kraken.py
index 4843115..fa0af6d 100644
--- a/tools/perf/benchmarks/kraken.py
+++ b/tools/perf/benchmarks/kraken.py
@@ -7,7 +7,7 @@
 import os
 
 from metrics import power
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -49,7 +49,7 @@ decodeURIComponent(formElement.value.split("?")[1]);
     results.Add('Total', 'ms', total)
 
 
-class Kraken(test.Test):
+class Kraken(benchmark.Benchmark):
   """Mozilla's Kraken JavaScript benchmark."""
   test = _KrakenMeasurement
 
diff --git a/tools/perf/benchmarks/maps.py b/tools/perf/benchmarks/maps.py
index 43f30d4..4f44007 100644
--- a/tools/perf/benchmarks/maps.py
+++ b/tools/perf/benchmarks/maps.py
@@ -8,7 +8,7 @@ Rerforms several common navigation actions on the map (pan, zoom, rotate)"""
 import os
 import re
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page as page_module
@@ -42,8 +42,8 @@ class MapsPage(page_module.Page):
     action_runner.WaitForJavaScriptCondition('window.testDone')
 
 
-@test.Disabled
-class MapsBenchmark(test.Test):
+@benchmark.Disabled
+class MapsBenchmark(benchmark.Benchmark):
   """Basic Google Maps benchmarks."""
   test = _MapsMeasurement
 
diff --git a/tools/perf/benchmarks/media.py b/tools/perf/benchmarks/media.py
index a5edabd..8520468 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
diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py
index 9d4a740..90752a7 100644
--- a/tools/perf/benchmarks/memory.py
+++ b/tools/perf/benchmarks/memory.py
@@ -1,30 +1,30 @@
 # Copyright 2013 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 measurements import memory
 import page_sets
 
 
-@test.Disabled('android')  # crbug.com/370977
-class MemoryMobile(test.Test):
+@benchmark.Disabled('android')  # crbug.com/370977
+class MemoryMobile(benchmark.Benchmark):
   test = memory.Memory
   page_set = page_sets.MobileMemoryPageSet
 
 
-class MemoryTop25(test.Test):
+class MemoryTop25(benchmark.Benchmark):
   test = memory.Memory
   page_set = page_sets.Top25PageSet
 
 
-class Reload2012Q3(test.Test):
+class Reload2012Q3(benchmark.Benchmark):
   tag = 'reload'
   test = memory.Memory
   page_set = page_sets.Top2012Q3PageSet
 
 
-@test.Disabled('android')  # crbug.com/371153
-class MemoryToughDomMemoryCases(test.Test):
+@benchmark.Disabled('android')  # crbug.com/371153
+class MemoryToughDomMemoryCases(benchmark.Benchmark):
   test = memory.Memory
   page_set = page_sets.ToughDomMemoryCasesPageSet
diff --git a/tools/perf/benchmarks/memory_pressure.py b/tools/perf/benchmarks/memory_pressure.py
index fe00f47..6fc3d41 100644
--- a/tools/perf/benchmarks/memory_pressure.py
+++ b/tools/perf/benchmarks/memory_pressure.py
@@ -2,13 +2,13 @@
 # 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 measurements import memory_pressure
 import page_sets
 
 
-@test.Enabled('has tabs')
-class MemoryPressure(test.Test):
+@benchmark.Enabled('has tabs')
+class MemoryPressure(benchmark.Benchmark):
   test = memory_pressure.MemoryPressure
   page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 6}
diff --git a/tools/perf/benchmarks/octane.py b/tools/perf/benchmarks/octane.py
index c53b63b..dca1bce 100644
--- a/tools/perf/benchmarks/octane.py
+++ b/tools/perf/benchmarks/octane.py
@@ -14,7 +14,7 @@ Octane 2.0 consists of 17 tests, four more than Octane v1.
 import os
 
 from metrics import power
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 from telemetry.util import statistics
@@ -75,7 +75,7 @@ class _OctaneMeasurement(page_measurement.PageMeasurement):
         scalar.ScalarValue(None, 'Total.Score', 'score', total))
 
 
-class Octane(test.Test):
+class Octane(benchmark.Benchmark):
   """Google's Octane JavaScript benchmark."""
   test = _OctaneMeasurement
 
diff --git a/tools/perf/benchmarks/page_cycler.py b/tools/perf/benchmarks/page_cycler.py
index 4db9b27..1ee750b 100644
--- a/tools/perf/benchmarks/page_cycler.py
+++ b/tools/perf/benchmarks/page_cycler.py
@@ -4,67 +4,67 @@
 
 from measurements import page_cycler
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 
 
-class PageCyclerBloat(test.Test):
+class PageCyclerBloat(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.BloatPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerDhtml(test.Test):
+class PageCyclerDhtml(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.DhtmlPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerIntlArFaHe(test.Test):
+class PageCyclerIntlArFaHe(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.IntlArFaHePageSet
   options = {'pageset_repeat': 10}
 
 
-@test.Disabled('win')  # crbug.com/388337
-class PageCyclerIntlEsFrPtBr(test.Test):
+@benchmark.Disabled('win')  # crbug.com/388337
+class PageCyclerIntlEsFrPtBr(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.IntlEsFrPtBrPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerIntlHiRu(test.Test):
+class PageCyclerIntlHiRu(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.IntlHiRuPageSet
   options = {'pageset_repeat': 10}
 
 
-@test.Disabled('android', 'win')  # crbug.com/379564, crbug.com/330909
-class PageCyclerIntlJaZh(test.Test):
+@benchmark.Disabled('android', 'win')  # crbug.com/379564, crbug.com/330909
+class PageCyclerIntlJaZh(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.IntlJaZhPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerIntlKoThVi(test.Test):
+class PageCyclerIntlKoThVi(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.IntlKoThViPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerMorejs(test.Test):
+class PageCyclerMorejs(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.MorejsPageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerMoz(test.Test):
+class PageCyclerMoz(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.MozPageSet
   options = {'pageset_repeat': 10}
 
 
-@test.Disabled('linux', 'win')  # crbug.com/353260
-class PageCyclerNetsimTop10(test.Test):
+@benchmark.Disabled('linux', 'win')  # crbug.com/353260
+class PageCyclerNetsimTop10(benchmark.Benchmark):
   """Measures load time of the top 10 sites under simulated cable network."""
   tag = 'netsim'
   test = page_cycler.PageCycler
@@ -85,20 +85,20 @@ class PageCyclerNetsimTop10(test.Test):
     self.test.clear_cache_before_each_run = True
 
 
-class PageCyclerTop10Mobile(test.Test):
+class PageCyclerTop10Mobile(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.Top10MobilePageSet
   options = {'pageset_repeat': 10}
 
 
-class PageCyclerKeyMobileSites(test.Test):
+class PageCyclerKeyMobileSites(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.KeyMobileSitesPageSet
   options = {'pageset_repeat': 10}
 
 
-@test.Disabled('android')  # crbug.com/357326
-class PageCyclerToughLayoutCases(test.Test):
+@benchmark.Disabled('android')  # crbug.com/357326
+class PageCyclerToughLayoutCases(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.ToughLayoutCasesPageSet
   options = {'pageset_repeat': 10}
@@ -106,8 +106,8 @@ class PageCyclerToughLayoutCases(test.Test):
 
 # crbug.com/273986: This test is really flakey on xp.
 # cabug.com/341843: This test is always timing out on Android.
-@test.Disabled('android', 'win')
-class PageCyclerTypical25(test.Test):
+@benchmark.Disabled('android', 'win')
+class PageCyclerTypical25(benchmark.Benchmark):
   test = page_cycler.PageCycler
   page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 10}
diff --git a/tools/perf/benchmarks/peacekeeper.py b/tools/perf/benchmarks/peacekeeper.py
index 4e4f7f3c..ff545a6 100644
--- a/tools/perf/benchmarks/peacekeeper.py
+++ b/tools/perf/benchmarks/peacekeeper.py
@@ -14,7 +14,7 @@ second depending on the test. Final Score is computed by calculating geometric
 mean of individual tests scores.
 """
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 from telemetry.util import statistics
@@ -68,7 +68,7 @@ class _PeaceKeeperMeasurement(page_measurement.PageMeasurement):
         scalar.ScalarValue(None, 'Total.Score', 'score', total))
 
 
-class PeaceKeeperBenchmark(test.Test):
+class PeaceKeeperBenchmark(benchmark.Benchmark):
   """A base class for Peackeeper benchmarks."""
   test = _PeaceKeeperMeasurement
 
diff --git a/tools/perf/benchmarks/pica.py b/tools/perf/benchmarks/pica.py
index 64a8046..eff3866 100644
--- a/tools/perf/benchmarks/pica.py
+++ b/tools/perf/benchmarks/pica.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 
 class _PicaMeasurement(page_measurement.PageMeasurement):
@@ -17,6 +17,6 @@ class _PicaMeasurement(page_measurement.PageMeasurement):
     results.Add('Total', 'ms', result)
 
 
-class Pica(test.Test):
+class Pica(benchmark.Benchmark):
   test = _PicaMeasurement
   page_set = page_sets.PicaPageSet
diff --git a/tools/perf/benchmarks/polymer_load.py b/tools/perf/benchmarks/polymer_load.py
index c225e2b..015c5bd 100644
--- a/tools/perf/benchmarks/polymer_load.py
+++ b/tools/perf/benchmarks/polymer_load.py
@@ -4,10 +4,10 @@
 
 import page_sets
 from measurements import polymer_load
-from telemetry import test
+from telemetry import benchmark
 
 
-class PolymerLoadPica(test.Test):
+class PolymerLoadPica(benchmark.Benchmark):
   """Measures time to polymer-ready for PICA
   """
   test = polymer_load.PolymerLoadMeasurement
diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
index f0dd5315..7ced8fa 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"""
diff --git a/tools/perf/benchmarks/repaint.py b/tools/perf/benchmarks/repaint.py
index c262d94..b7d6b8a 100644
--- a/tools/perf/benchmarks/repaint.py
+++ b/tools/perf/benchmarks/repaint.py
@@ -5,10 +5,10 @@
 from benchmarks import silk_flags
 from measurements import repaint
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 
 
-class RepaintKeyMobileSites(test.Test):
+class RepaintKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -16,7 +16,7 @@ class RepaintKeyMobileSites(test.Test):
   page_set = page_sets.KeyMobileSitesPageSet
 
 
-class RepaintGpuRasterizationKeyMobileSites(test.Test):
+class RepaintGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   """Measures repaint performance on the key mobile sites with forced GPU
   rasterization.
 
diff --git a/tools/perf/benchmarks/robohornet_pro.py b/tools/perf/benchmarks/robohornet_pro.py
index 99f3dc4..d532e60 100644
--- a/tools/perf/benchmarks/robohornet_pro.py
+++ b/tools/perf/benchmarks/robohornet_pro.py
@@ -7,7 +7,7 @@
 import os
 
 from metrics import power
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -36,7 +36,7 @@ class _RobohornetProMeasurement(page_measurement.PageMeasurement):
     results.Add('Total', 'ms', result)
 
 
-class RobohornetPro(test.Test):
+class RobohornetPro(benchmark.Benchmark):
   test = _RobohornetProMeasurement
 
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/scheduler.py b/tools/perf/benchmarks/scheduler.py
index fc5cb6b..6929d70 100644
--- a/tools/perf/benchmarks/scheduler.py
+++ b/tools/perf/benchmarks/scheduler.py
@@ -2,12 +2,12 @@
 # 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 measurements import smoothness
 import page_sets
 
 
-class SchedulerToughSchedulingCases(test.Test):
+class SchedulerToughSchedulingCases(benchmark.Benchmark):
   """Measures rendering statistics while interacting with pages that have
   challenging scheduling properties.
 
@@ -18,8 +18,8 @@ class SchedulerToughSchedulingCases(test.Test):
 
 
 # Pepper plugin is not supported on android.
-@test.Disabled('android', 'win')  # crbug.com/384733
-class SchedulerToughPepperCases(test.Test):
+@benchmark.Disabled('android', 'win')  # crbug.com/384733
+class SchedulerToughPepperCases(benchmark.Benchmark):
   """Measures rendering statistics while interacting with pages that have
   pepper plugins"""
   test = smoothness.Smoothness
diff --git a/tools/perf/benchmarks/scirra.py b/tools/perf/benchmarks/scirra.py
index b3ba56c..e01bf0f 100644
--- a/tools/perf/benchmarks/scirra.py
+++ b/tools/perf/benchmarks/scirra.py
@@ -10,7 +10,7 @@ represented onscreen when the animation reaches the 30 FPS threshold.
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -50,7 +50,7 @@ class _ScirraMeasurement(page_measurement.PageMeasurement):
     results.Add('Count', 'count', total)
 
 
-class ScirraBenchmark(test.Test):
+class ScirraBenchmark(benchmark.Benchmark):
   """WebGL and Canvas2D rendering benchmark suite."""
   test = _ScirraMeasurement
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py
index 08517ef..d166451 100644
--- a/tools/perf/benchmarks/service_worker.py
+++ b/tools/perf/benchmarks/service_worker.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 
 
@@ -20,6 +20,6 @@ class _ServiceWorkerMeasurement(page_measurement.PageMeasurement):
       results.Add(key, value['units'], value['value'])
 
 
-class ServiceWorkerPerfTest(test.Test):
+class ServiceWorkerPerfTest(benchmark.Benchmark):
   test = _ServiceWorkerMeasurement
   page_set = page_sets.ServiceWorkerPageSet
diff --git a/tools/perf/benchmarks/session_restore.py b/tools/perf/benchmarks/session_restore.py
index 9641ba8..d6e9099 100644
--- a/tools/perf/benchmarks/session_restore.py
+++ b/tools/perf/benchmarks/session_restore.py
@@ -9,11 +9,11 @@ from measurements import session_restore
 from measurements import session_restore_with_url
 import page_sets
 from profile_creators import small_profile_creator
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import profile_generator
 
 
-class _SessionRestoreTest(test.Test):
+class _SessionRestoreTest(benchmark.Benchmark):
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
@@ -30,7 +30,7 @@ class _SessionRestoreTest(test.Test):
       args.browser_options.profile_dir = os.path.join(profile_dir, profile_type)
 
 
-@test.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
+@benchmark.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
 class SessionRestoreColdTypical25(_SessionRestoreTest):
   tag = 'cold'
   test = session_restore.SessionRestore
@@ -39,7 +39,7 @@ class SessionRestoreColdTypical25(_SessionRestoreTest):
              'pageset_repeat': 5}
 
 
-@test.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
+@benchmark.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
 class SessionRestoreWarmTypical25(_SessionRestoreTest):
   tag = 'warm'
   test = session_restore.SessionRestore
@@ -48,7 +48,7 @@ class SessionRestoreWarmTypical25(_SessionRestoreTest):
              'pageset_repeat': 20}
 
 
-@test.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
+@benchmark.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
 class SessionRestoreWithUrlCold(_SessionRestoreTest):
   """Measure Chrome cold session restore with startup URLs."""
   tag = 'cold'
@@ -58,7 +58,7 @@ class SessionRestoreWithUrlCold(_SessionRestoreTest):
              'pageset_repeat': 5}
 
 
-@test.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
+@benchmark.Disabled('android', 'linux')  # crbug.com/325479, crbug.com/381990
 class SessionRestoreWithUrlWarm(_SessionRestoreTest):
   """Measure Chrome warm session restore with startup URLs."""
   tag = 'warm'
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py
index 93a2027..88cdf28 100644
--- a/tools/perf/benchmarks/smoothness.py
+++ b/tools/perf/benchmarks/smoothness.py
@@ -2,14 +2,14 @@
 # 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 smoothness
 import page_sets
 
 
-class SmoothnessTop25(test.Test):
+class SmoothnessTop25(benchmark.Benchmark):
   """Measures rendering statistics while scrolling down the top 25 web pages.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -17,24 +17,24 @@ class SmoothnessTop25(test.Test):
   page_set = page_sets.Top25PageSet
 
 
-@test.Disabled('mac')  # crbug.com/388877
-class SmoothnessToughCanvasCases(test.Test):
+@benchmark.Disabled('mac')  # crbug.com/388877
+class SmoothnessToughCanvasCases(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.ToughCanvasCasesPageSet
 
 
-@test.Disabled  # crbug.com/373812
-class SmoothnessToughWebGLCases(test.Test):
+@benchmark.Disabled  # crbug.com/373812
+class SmoothnessToughWebGLCases(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.ToughWebglCasesPageSet
 
 
-class SmoothnessMaps(test.Test):
+class SmoothnessMaps(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.MapsPageSet
 
 
-class SmoothnessKeyMobileSites(test.Test):
+class SmoothnessKeyMobileSites(benchmark.Benchmark):
   """Measures rendering statistics while scrolling down the key mobile sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
@@ -42,13 +42,13 @@ class SmoothnessKeyMobileSites(test.Test):
   page_set = page_sets.KeyMobileSitesPageSet
 
 
-@test.Disabled('android')  # crbug.com/350692
-class SmoothnessToughAnimationCases(test.Test):
+@benchmark.Disabled('android')  # crbug.com/350692
+class SmoothnessToughAnimationCases(benchmark.Benchmark):
   test = smoothness.Smoothness
   page_set = page_sets.ToughAnimationCasesPageSet
 
 
-class SmoothnessKeySilkCases(test.Test):
+class SmoothnessKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization
   """
@@ -56,7 +56,7 @@ class SmoothnessKeySilkCases(test.Test):
   page_set = page_sets.KeySilkCasesPageSet
 
 
-class SmoothnessFastPathKeySilkCases(test.Test):
+class SmoothnessFastPathKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization using bleeding edge rendering fast paths.
   """
@@ -67,8 +67,8 @@ class SmoothnessFastPathKeySilkCases(test.Test):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
-@test.Disabled('android')  # crbug.com/363783
-class SmoothnessGpuRasterizationTop25(test.Test):
+@benchmark.Disabled('android')  # crbug.com/363783
+class SmoothnessGpuRasterizationTop25(benchmark.Benchmark):
   """Measures rendering statistics for the top 25 with GPU rasterization
   """
   tag = 'gpu_rasterization'
@@ -78,8 +78,8 @@ class SmoothnessGpuRasterizationTop25(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@test.Disabled('android')  # crbug.com/363783
-class SmoothnessGpuRasterizationKeyMobileSites(test.Test):
+@benchmark.Disabled('android')  # crbug.com/363783
+class SmoothnessGpuRasterizationKeyMobileSites(benchmark.Benchmark):
   """Measures rendering statistics for the key mobile sites with GPU
   rasterization
   """
@@ -90,7 +90,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-class SmoothnessGpuRasterizationKeySilkCases(test.Test):
+class SmoothnessGpuRasterizationKeySilkCases(benchmark.Benchmark):
   """Measures rendering statistics for the key silk cases with GPU rasterization
   """
   tag = 'gpu_rasterization'
@@ -114,8 +114,8 @@ class SmoothnessFastPathGpuRasterizationKeySilkCases(
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
-@test.Enabled('android')
-class SmoothnessToughPinchZoomCases(test.Test):
+@benchmark.Enabled('android')
+class SmoothnessToughPinchZoomCases(benchmark.Benchmark):
   """Measures rendering statistics for pinch-zooming into the tough pinch zoom
   cases
   """
@@ -123,16 +123,16 @@ class SmoothnessToughPinchZoomCases(test.Test):
   page_set = page_sets.ToughPinchZoomCasesPageSet
 
 
-@test.Disabled  # crbug.com/370725
-class SmoothnessPolymer(test.Test):
+@benchmark.Disabled  # crbug.com/370725
+class SmoothnessPolymer(benchmark.Benchmark):
   """Measures rendering statistics for Polymer cases.
   """
   test = smoothness.Smoothness
   page_set = page_sets.PolymerPageSet
 
 
-@test.Disabled  # crbug.com/370725
-class SmoothnessFastPathPolymer(test.Test):
+@benchmark.Disabled  # crbug.com/370725
+class SmoothnessFastPathPolymer(benchmark.Benchmark):
   """Measures rendering statistics for the Polymer cases without GPU
   rasterization using bleeding edge rendering fast paths.
   """
@@ -143,8 +143,8 @@ class SmoothnessFastPathPolymer(test.Test):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
-@test.Disabled  # crbug.com/370725
-class SmoothnessGpuRasterizationPolymer(test.Test):
+@benchmark.Disabled  # crbug.com/370725
+class SmoothnessGpuRasterizationPolymer(benchmark.Benchmark):
   """Measures rendering statistics for the Polymer cases with GPU rasterization
   """
   tag = 'gpu_rasterization'
@@ -154,7 +154,7 @@ class SmoothnessGpuRasterizationPolymer(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
-@test.Disabled  # crbug.com/370725
+@benchmark.Disabled  # crbug.com/370725
 class SmoothnessFastPathGpuRasterizationPolymer(
     SmoothnessGpuRasterizationPolymer):
   """Measures rendering statistics for the Polymer cases with GPU rasterization
diff --git a/tools/perf/benchmarks/spaceport.py b/tools/perf/benchmarks/spaceport.py
index cd4d773..4c37838 100644
--- a/tools/perf/benchmarks/spaceport.py
+++ b/tools/perf/benchmarks/spaceport.py
@@ -7,7 +7,7 @@
 import logging
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
@@ -56,8 +56,8 @@ class _SpaceportMeasurement(page_measurement.PageMeasurement):
 
 
 # crbug.com/166703: This test frequently times out on Windows.
-@test.Disabled('mac', 'win')
-class Spaceport(test.Test):
+@benchmark.Disabled('mac', 'win')
+class Spaceport(benchmark.Benchmark):
   """spaceport.io's PerfMarks benchmark."""
   test = _SpaceportMeasurement
 
diff --git a/tools/perf/benchmarks/speedometer.py b/tools/perf/benchmarks/speedometer.py
index 260d55e..5de0c1e 100644
--- a/tools/perf/benchmarks/speedometer.py
+++ b/tools/perf/benchmarks/speedometer.py
@@ -18,7 +18,7 @@ engine, CSS style resolution, layout, and other technologies.
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -34,8 +34,8 @@ class SpeedometerMeasurement(page_measurement.PageMeasurement):
         'Total', 'ms', tab.EvaluateJavaScript('benchmarkClient._timeValues'))
 
 
-@test.Disabled('android')  # Times out
-class Speedometer(test.Test):
+@benchmark.Disabled('android')  # Times out
+class Speedometer(benchmark.Benchmark):
   test = SpeedometerMeasurement
 
   def CreatePageSet(self, options):
diff --git a/tools/perf/benchmarks/start_with_url.py b/tools/perf/benchmarks/start_with_url.py
index 20d65e9..b4700e6c 100644
--- a/tools/perf/benchmarks/start_with_url.py
+++ b/tools/perf/benchmarks/start_with_url.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 measurements import startup
 import page_sets
 
 
-@test.Disabled('snowleopard') # crbug.com/336913
-class StartWithUrlCold(test.Test):
+@benchmark.Disabled('snowleopard') # crbug.com/336913
+class StartWithUrlCold(benchmark.Benchmark):
   """Measure time to start Chrome cold with startup URLs"""
   tag = 'cold'
   test = startup.StartWithUrl
@@ -16,7 +16,7 @@ class StartWithUrlCold(test.Test):
   options = {'cold': True,
              'pageset_repeat': 5}
 
-class StartWithUrlWarm(test.Test):
+class StartWithUrlWarm(benchmark.Benchmark):
   """Measure time to start Chrome warm with startup URLs"""
   tag = 'warm'
   test = startup.StartWithUrl
diff --git a/tools/perf/benchmarks/startup.py b/tools/perf/benchmarks/startup.py
index 5c80987..c8372fc 100644
--- a/tools/perf/benchmarks/startup.py
+++ b/tools/perf/benchmarks/startup.py
@@ -1,14 +1,14 @@
 # Copyright 2013 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 measurements import startup
 import page_sets
 
 
-@test.Disabled('snowleopard') # crbug.com/336913
-class StartupColdBlankPage(test.Test):
+@benchmark.Disabled('snowleopard') # crbug.com/336913
+class StartupColdBlankPage(benchmark.Benchmark):
   tag = 'cold'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
@@ -16,15 +16,15 @@ class StartupColdBlankPage(test.Test):
              'pageset_repeat': 5}
 
 
-class StartupWarmBlankPage(test.Test):
+class StartupWarmBlankPage(benchmark.Benchmark):
   tag = 'warm'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
   options = {'warm': True,
              'pageset_repeat': 20}
 
-@test.Disabled('snowleopard') # crbug.com/336913
-class StartupColdTheme(test.Test):
+@benchmark.Disabled('snowleopard') # crbug.com/336913
+class StartupColdTheme(benchmark.Benchmark):
   tag = 'theme_cold'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
@@ -33,7 +33,7 @@ class StartupColdTheme(test.Test):
              'pageset_repeat': 5}
 
 
-class StartupWarmTheme(test.Test):
+class StartupWarmTheme(benchmark.Benchmark):
   tag = 'theme_warm'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
@@ -41,8 +41,8 @@ class StartupWarmTheme(test.Test):
   options = {'warm': True,
              'pageset_repeat': 20}
 
-@test.Disabled('snowleopard') # crbug.com/336913
-class StartupColdManyExtensions(test.Test):
+@benchmark.Disabled('snowleopard') # crbug.com/336913
+class StartupColdManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_cold'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
@@ -51,7 +51,7 @@ class StartupColdManyExtensions(test.Test):
              'pageset_repeat': 5}
 
 
-class StartupWarmManyExtensions(test.Test):
+class StartupWarmManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_warm'
   test = startup.Startup
   page_set = page_sets.BlankPageSet
diff --git a/tools/perf/benchmarks/sunspider.py b/tools/perf/benchmarks/sunspider.py
index 776eee2..62a6a50 100644
--- a/tools/perf/benchmarks/sunspider.py
+++ b/tools/perf/benchmarks/sunspider.py
@@ -6,7 +6,7 @@ import json
 import os
 
 from metrics import power
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
@@ -51,7 +51,7 @@ class _SunspiderMeasurement(page_measurement.PageMeasurement):
     results.Add('Total', 'ms', totals)
 
 
-class Sunspider(test.Test):
+class Sunspider(benchmark.Benchmark):
   """Apple's SunSpider JavaScript benchmark."""
   test = _SunspiderMeasurement
 
diff --git a/tools/perf/benchmarks/tab_switching.py b/tools/perf/benchmarks/tab_switching.py
index a79ab52..a1cb74c 100644
--- a/tools/perf/benchmarks/tab_switching.py
+++ b/tools/perf/benchmarks/tab_switching.py
@@ -2,33 +2,33 @@
 # 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 measurements import tab_switching
 import page_sets
 
 
-@test.Enabled('has tabs')
-class TabSwitchingTop10(test.Test):
+@benchmark.Enabled('has tabs')
+class TabSwitchingTop10(benchmark.Benchmark):
   test = tab_switching.TabSwitching
   page_set = page_sets.Top10PageSet
 
 
-@test.Enabled('has tabs')
-class TabSwitchingTypical25(test.Test):
+@benchmark.Enabled('has tabs')
+class TabSwitchingTypical25(benchmark.Benchmark):
   test = tab_switching.TabSwitching
   page_set = page_sets.Typical25PageSet
 
 
-@test.Enabled('has tabs')
-class TabSwitchingFiveBlankTabs(test.Test):
+@benchmark.Enabled('has tabs')
+class TabSwitchingFiveBlankTabs(benchmark.Benchmark):
   test = tab_switching.TabSwitching
   page_set = page_sets.FiveBlankPagesPageSet
   options = {'pageset_repeat': 10}
 
 
-@test.Enabled('has tabs')
-class TabSwitchingToughEnergyCases(test.Test):
+@benchmark.Enabled('has tabs')
+class TabSwitchingToughEnergyCases(benchmark.Benchmark):
   test = tab_switching.TabSwitching
   page_set = page_sets.ToughEnergyCasesPageSet
   options = {'pageset_repeat': 10}
diff --git a/tools/perf/benchmarks/thread_times.py b/tools/perf/benchmarks/thread_times.py
index 65c33a7..1ae79c6 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
diff --git a/tools/perf/benchmarks/webrtc.py b/tools/perf/benchmarks/webrtc.py
index 9095a78c..a9a7b30 100644
--- a/tools/perf/benchmarks/webrtc.py
+++ b/tools/perf/benchmarks/webrtc.py
@@ -4,10 +4,10 @@
 
 from measurements import webrtc
 import page_sets
-from telemetry import test
+from telemetry import benchmark
 
 
-class WebRTC(test.Test):
+class WebRTC(benchmark.Benchmark):
   """Obtains WebRTC metrics for a real-time video tests."""
   test = webrtc.WebRTC
   page_set = page_sets.WebrtcCasesPageSet