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

tools/perf/benchmarks/dom_perf.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.
 
 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
 from telemetry.value import merge_values
 from telemetry.value import scalar
 
 
 def _GeometricMean(values):
   """Compute a rounded geometric mean from an array of values."""
   if not values:
@@ skipping 42 matching lines @@
     combined = merge_values.MergeLikeValuesFromDifferentPages(
         results.all_page_specific_values,
         group_by_name_suffix=True)
     combined_score = [x for x in combined if x.name == SCORE_TRACE_NAME][0]
     total = _GeometricMean(combined_score.values)
     results.AddSummaryValue(
         scalar.ScalarValue(None, 'Total.' + SCORE_TRACE_NAME, SCORE_UNIT,
                            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.
   Scores are not comparable across benchmark suite versions and higher scores
   means better performance: Bigger is better!"""
   test = _DomPerfMeasurement
 
   def CreatePageSet(self, options):
     dom_perf_dir = os.path.join(util.GetChromiumSrcDir(), 'data', 'dom_perf')
     run_params = [
       'Accessors',
       'CloneNodes',
       'CreateNodes',
       'DOMDivWalk',
       'DOMTable',
       'DOMWalk',
       'Events',
       'Get+Elements',
       'GridSort',
       'Template'
     ]
     ps = page_set.PageSet(file_path=dom_perf_dir)
     for param in run_params:
       ps.AddPageWithDefaultRunNavigate(
         'file://run.html?reportInJS=1&run=%s' % param)
     return ps