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

tools/perf/benchmarks/dromaeo.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 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
 
 
 class _DromaeoMeasurement(page_measurement.PageMeasurement):
   def __init__(self):
     super(_DromaeoMeasurement, self).__init__()
     self._power_metric = power.PowerMetric()
 
   def CustomizeBrowserOptions(self, options):
@@ skipping 59 matching lines @@
 
       escaped_top_name = data['collection'].split('-', 1)[0]
       AggregateData(aggregated, escaped_top_name, data['mean'])
 
       escaped_collection = data['collection']
       AggregateData(aggregated, escaped_collection, data['mean'])
 
     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
 
   def CreatePageSet(self, options):
     """Makes a PageSet for Dromaeo benchmarks."""
     # Subclasses are expected to define class members called query_param and
     # tag.
     if not hasattr(self, 'query_param') or not hasattr(self, 'tag'):
       raise NotImplementedError('query_param or tag not in Dromaeo benchmark.')
     archive_data_file = '../page_sets/data/dromaeo.%s.json' % self.tag
     ps = page_set.PageSet(
         make_javascript_deterministic=False,
         archive_data_file=archive_data_file,
         file_path=os.path.abspath(__file__))
     url = 'http://dromaeo.com?%s' % self.query_param
     ps.AddPageWithDefaultRunNavigate(url)
     return ps
 
 
 class DromaeoDomCoreAttr(_DromaeoBenchmark):
   """Dromaeo DOMCore attr JavaScript benchmark."""
   tag = 'domcoreattr'
   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'
   query_param = 'dom-modify'
 
 
 class DromaeoDomCoreQuery(_DromaeoBenchmark):
   """Dromaeo DOMCore query JavaScript benchmark."""
   tag = 'domcorequery'
   query_param = 'dom-query'
@@ skipping 63 matching lines @@
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'
 
 
 class DromaeoCSSQueryJquery(_DromaeoBenchmark):
   """Dromaeo CSS Query jquery JavaScript benchmark"""
   tag = 'cssqueryjquery'
   query_param = 'cssquery-jquery'