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 os
 
 from metrics import power
-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
 
 
 class _DromaeoMeasurement(page_measurement.PageMeasurement):
   def __init__(self):
     super(_DromaeoMeasurement, self).__init__()
     self._power_metric = power.PowerMetric()
 
@@ skipping 21 matching lines @@
       return k
 
     suffix = page.url[page.url.index('?') + 1 : page.url.index('&')]
     for k, v in score.iteritems():
       data_type = 'unimportant'
       if k == suffix:
         data_type = 'default'
       results.Add(Escape(k), 'runs/s', float(v), data_type=data_type)
 
 
-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 a class member called query_param.
     if not hasattr(self, 'query_param'):
       raise NotImplementedError('query_param not in Dromaeo benchmark.')
     url = 'file://index.html?%s&automated' % self.query_param
     dromaeo_dir = os.path.join(util.GetChromiumSrcDir(),
                                'chrome', 'test', 'data', 'dromaeo')
     ps = page_set.PageSet(file_path=dromaeo_dir)
     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 57 matching lines @@
   """Dromaeo JSLib traverse jquery JavaScript benchmark"""
   tag = 'jslibtraversejquery'
   query_param = 'jslib-traverse-jquery'
 
 
 class DromaeoJslibTraversePrototype(_DromaeoBenchmark):
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'