Merge PageMeasurement to PageTest.

tools/perf/measurements/rasterize_and_record_micro.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 sys
 import time
 
 from telemetry.core.util import TimeoutException
-from telemetry.page import page_measurement
 from telemetry.page import page_test
 from telemetry.value import scalar
 
 
-class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
+class RasterizeAndRecordMicro(page_test.PageTest):
   def __init__(self):
     super(RasterizeAndRecordMicro, self).__init__('')
     self._chrome_branch_number = None
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_option('--start-wait-time', type='float',
                       default=2,
                       help='Wait time before the benchmark is started '
                       '(must be long enought to load all content)')
@@ skipping 51 matching lines @@
                   window.benchmark_results.done = true;
                   window.benchmark_results.results = value;
                 }, {
                   "record_repeat_count": """ + str(record_repeat) + """,
                   "rasterize_repeat_count": """ + str(rasterize_repeat) + """
                 });
     """)
 
     benchmark_id = tab.EvaluateJavaScript('window.benchmark_results.id')
     if (not benchmark_id):
-      raise page_measurement.MeasurementFailure(
+      raise page_test.MeasurementFailure(
           'Failed to schedule rasterize_and_record_micro')
 
     tab.WaitForJavaScriptExpression(
         'window.benchmark_results.done', self.options.timeout)
 
     data = tab.EvaluateJavaScript('window.benchmark_results.results')
 
     pixels_recorded = data['pixels_recorded']
     record_time = data['record_time_ms']
     pixels_rasterized = data['pixels_rasterized']
@@ skipping 47 matching lines @@
           results.current_page, 'total_layers', 'count', total_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers', 'count',
           total_picture_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_with_no_content', 'count',
           total_picture_layers_with_no_content))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_off_screen', 'count',
           total_picture_layers_off_screen))