Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / tools / perf / measurements / screenshot.py

diff --git a/src/tools/perf/measurements/screenshot.py b/src/tools/perf/measurements/screenshot.py
index 1459bce..e3b0c33 100644 (file)
--- a/src/tools/perf/measurements/screenshot.py
+++ b/src/tools/perf/measurements/screenshot.py
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 import os
 
-from telemetry.page import page_measurement
 from telemetry.page import page_test
+from telemetry.page import page_test
+from telemetry.value import scalar
 
 
-class Screenshot(page_measurement.PageMeasurement):
+class Screenshot(page_test.PageTest):
   def __init__(self):
     super(Screenshot, self).__init__(
         action_name_to_run = 'RunPrepareForScreenshot',
@@ -24,7 +25,7 @@ class Screenshot(page_measurement.PageMeasurement):
       parser.error('Please specify --png-outdir')
     cls._png_outdir = args.png_outdir
 
-  def MeasurePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if not tab.screenshot_supported:
       raise page_test.TestNotSupportedOnPlatformFailure(
           'Browser does not support screenshotting')
@@ -45,4 +46,6 @@ class Screenshot(page_measurement.PageMeasurement):
     saved_picture_count = 0
     if os.path.exists(outpath) and os.path.getmtime(outpath) > previous_mtime:
       saved_picture_count = 1
-    results.Add('saved_picture_count', 'count', saved_picture_count)
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, 'saved_picture_count', 'count',
+        saved_picture_count))