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

tools/perf/benchmarks/maps.py

 # 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.
 
 """Runs a Google Maps performance test.
 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
 from telemetry.page import page_set as page_set_module
 # pylint: disable=W0401,W0614
 from telemetry.page.actions.all_page_actions import *
 from telemetry.value import scalar
 
 
 class _MapsMeasurement(page_measurement.PageMeasurement):
@@ skipping 13 matching lines @@
     super(MapsPage, self).__init__(
       url='http://localhost:10020/tracker.html',
       page_set=page_set,
       base_dir=base_dir)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForJavaScriptCondition('window.testDone')
 
 
-@test.Disabled
-class MapsBenchmark(test.Test):
+@benchmark.Disabled
+class MapsBenchmark(benchmark.Benchmark):
   """Basic Google Maps benchmarks."""
   test = _MapsMeasurement
 
   def CreatePageSet(self, options):
     page_set_path = os.path.join(
         util.GetChromiumSrcDir(), 'tools', 'perf', 'page_sets')
     ps = page_set_module.PageSet(
       archive_data_file='data/maps.json',
       make_javascript_deterministic=False,
       file_path=page_set_path)
     ps.AddPage(MapsPage(ps, ps.base_dir))
     return ps
 
 class MapsNoVsync(MapsBenchmark):
   """Runs the Google Maps benchmark with Vsync disabled"""
   tag = 'novsync'
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--disable-gpu-vsync')