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

tools/perf/benchmarks/canvasmark.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 Canvasmark HTML5, Canvas 2D rendering and javascript benchmark.
 
 CanvasMark tests the HTML5 <canvas> rendering performance for commonly used
 operations in HTML5 games: bitmaps, canvas drawing, alpha blending, polygon
 fills, shadows and text functions.
 """
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
 
 class _CanvasMarkMeasurement(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = """
         var __results = [];
         var __real_log = window.console.log;
@@ skipping 14 matching lines @@
       assert len(score_and_name) == 2, \
         'Unexpected result format "%s"' % score_and_name
       score = int(score_and_name[0])
       name = score_and_name[1][:-1]
       results.Add(name, 'score', score, data_type='unimportant')
       # Aggregate total score for all tests.
       total += score
     results.Add('Score', 'score', total)
 
 
-class CanvasMark(test.Test):
+class CanvasMark(benchmark.Benchmark):
   test = _CanvasMarkMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       file_path=os.path.abspath(__file__),
       archive_data_file='../page_sets/data/canvasmark.json',
       make_javascript_deterministic=False)
     ps.AddPageWithDefaultRunNavigate(
       'http://www.kevs3d.co.uk/dev/canvasmark/?auto=true')
     return ps