Merge PageMeasurement to PageTest.

tools/perf/measurements/smoothness_controller.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.
 import sys
 
 from measurements import smooth_gesture_util
 from telemetry.timeline.model import TimelineModel
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 from telemetry.page.actions import action_runner
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
 from telemetry.web_perf import timeline_interaction_record as tir_module
 from telemetry.web_perf.metrics import smoothness
 
 
 RUN_SMOOTH_ACTIONS = 'RunSmoothAllActions'
 
 # Descriptions for results from platform.GetRawDisplayFrameRateMeasurements().
 DESCRIPTIONS = {
     'avg_surface_fps': 'Average frames per second as measured by the '
                        'platform\'s SurfaceFlinger.'
 }
 
 
-class MissingDisplayFrameRateError(page_measurement.MeasurementFailure):
+class MissingDisplayFrameRateError(page_test.MeasurementFailure):
   def __init__(self, name):
     super(MissingDisplayFrameRateError, self).__init__(
       'Missing display frame rate metrics: ' + name)
 
 class SmoothnessController(object):
   def __init__(self):
     self._timeline_model = None
     self._tracing_timeline_data = None
     self._interaction = None
 
@@ skipping 76 matching lines @@
         else:
           results.AddValue(scalar.ScalarValue(
               results.current_page, r.name, r.unit, r.value,
               description=DESCRIPTIONS.get(r.name)))
 
   def CleanUp(self, tab):
     if tab.browser.platform.IsRawDisplayFrameRateSupported():
       tab.browser.platform.StopRawDisplayFrameRateMeasurement()
     if tab.browser.is_tracing_running:
       tab.browser.StopTracing()