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

tools/perf/benchmarks/session_restore.py

Index: tools/perf/benchmarks/session_restore.py
diff --git a/tools/perf/benchmarks/session_restore.py b/tools/perf/benchmarks/session_restore.py
index 9641ba8b6b7489d2db5dd619d0d941bad519fd3d..d6e9099114c5766c077af3e522fb001ddadb94d3 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'