Modify all usage of PageMeasurement to use PageTest in tools/telemetry.

tools/telemetry/telemetry/page/record_wpr.py

 #!/usr/bin/env python
 # Copyright 2012 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 logging
 import sys
 import time
 
 from telemetry import benchmark
 from telemetry.core import browser_options
 from telemetry.core import discover
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement
 from telemetry.page import page_runner
 from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.page import profile_creator
 from telemetry.page import test_expectations
 from telemetry.results import results_options
 
 
 class RecorderPageTest(page_test.PageTest):  # pylint: disable=W0223
   def __init__(self, action_names):
@@ skipping 16 matching lines @@
       self.page_test.DidNavigateToPage(page, tab)
 
   def WillRunActions(self, page, tab):
     if self.page_test:
       self.page_test.WillRunActions(page, tab)
 
   def DidRunActions(self, page, tab):
     if self.page_test:
       self.page_test.DidRunActions(page, tab)
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if self.page_test:
-      self.page_test.ValidatePage(page, tab, results)
+      self.page_test.ValidateAndMeasurePage(page, tab, results)
 
   def RunPage(self, page, tab, results):
     tab.WaitForDocumentReadyStateToBeComplete()
 
     # When recording, sleep to catch any resources that load post-onload.
     # TODO(tonyg): This should probably monitor resource timing for activity
     # and sleep until 2s since the last network event with some timeout like
     # 20s. We could wrap this up as WaitForNetworkIdle() and share with the
     # speed index metric.
     time.sleep(3)
@@ skipping 19 matching lines @@
   def RunNavigateSteps(self, page, tab):
     if self.page_test:
       self.page_test.RunNavigateSteps(page, tab)
     else:
       super(RecorderPageTest, self).RunNavigateSteps(page, tab)
 
 
 def FindAllActionNames(base_dir):
   """Returns a set of of all action names used in our measurements."""
   action_names = set()
-  # Get all PageMeasurements except for ProfileCreators (see crbug.com/319573)
+  # Get all PageTests except for ProfileCreators (see crbug.com/319573)
   for _, cls in discover.DiscoverClasses(
-      base_dir, base_dir, page_measurement.PageMeasurement).items():
+      base_dir, base_dir, page_test.PageTest).items():
     if not issubclass(cls, profile_creator.ProfileCreator):
       action_name = cls().action_name_to_run
       if action_name:
         action_names.add(action_name)
   return action_names
 
 
 def _MaybeGetInstanceOfClass(target, base_dir, cls):
   if isinstance(target, cls):
     return target
@@ skipping 79 matching lines @@
   quick_args = [a for a in sys.argv[1:] if not a.startswith('-')]
   if len(quick_args) != 1:
     print >> sys.stderr, 'Usage: record_wpr <PageSet|Benchmark>\n'
     sys.exit(1)
   target = quick_args.pop()
   wpr_recorder = WprRecorder(base_dir, target)
   results = wpr_recorder.CreateResults()
   wpr_recorder.Record(results)
   wpr_recorder.HandleResults(results)
   return min(255, len(results.failures))