Merge PageMeasurement to PageTest.

tools/perf/measurements/skpicture_printer.py

Index: tools/perf/measurements/skpicture_printer.py
diff --git a/tools/perf/measurements/skpicture_printer.py b/tools/perf/measurements/skpicture_printer.py
index b4dcf4ca135fa7c23c46ab3ea337cb2e28a40c56..7ae56b49dda30ac7e1670d939fc2b83d0089e065 100644
--- a/tools/perf/measurements/skpicture_printer.py
+++ b/tools/perf/measurements/skpicture_printer.py
@@ -4,14 +4,14 @@
 import glob
 import os
 
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 from telemetry.value import scalar
 
 
 _JS = 'chrome.gpuBenchmarking.printToSkPicture("{0}");'
 
 
-class SkpicturePrinter(page_measurement.PageMeasurement):
+class SkpicturePrinter(page_test.PageTest):
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_option('-s', '--skp-outdir',
@@ -30,7 +30,7 @@ class SkpicturePrinter(page_measurement.PageMeasurement):
 
   def MeasurePage(self, page, tab, results):
     if tab.browser.platform.GetOSName() in ['android', 'chromeos']:
-      raise page_measurement.MeasurementFailure(
+      raise page_test.MeasurementFailure(
           'SkPicture printing not supported on this platform')
 
     # Replace win32 path separator char '\' with '\\'.