Merge PageMeasurement to PageTest.

tools/perf/measurements/repaint.py

 # Copyright 2014 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.
 
 from measurements import smoothness_controller
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 
 
-class Repaint(page_measurement.PageMeasurement):
+class Repaint(page_test.PageTest):
   def __init__(self):
     super(Repaint, self).__init__('RunRepaint', False)
     self._smoothness_controller = None
     self._micro_benchmark_id = None
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_option('--mode', type='string',
                       default='viewport',
                       help='Invalidation mode. '
@@ skipping 35 matching lines @@
             chrome.gpuBenchmarking.runMicroBenchmark(
                 "invalidation_benchmark",
                 function(value) {},
                 """ + str(args) + """
             );
     """)
 
     self._micro_benchmark_id = tab.EvaluateJavaScript(
         'window.benchmark_results.id')
     if (not self._micro_benchmark_id):
-      raise page_measurement.MeasurementFailure(
+      raise page_test.MeasurementFailure(
           'Failed to schedule invalidation_benchmark.')
 
   def DidRunActions(self, page, tab):
     tab.ExecuteJavaScript("""
         window.benchmark_results.message_handled =
             chrome.gpuBenchmarking.sendMessageToMicroBenchmark(
                 """ + str(self._micro_benchmark_id) + """, {
                   "notify_done": true
                 });
     """)
     self._smoothness_controller.Stop(tab)
 
   def MeasurePage(self, page, tab, results):
     self._smoothness_controller.AddResults(tab, results)
 
   def CleanUpAfterPage(self, _, tab):
     self._smoothness_controller.CleanUp(tab)