Refactor sunspider and scirra Telemetry benchmarks to use AddValue call

tools/perf/benchmarks/scirra.py

 # Copyright 2013 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.
 
 """Scirra WebGL and Canvas2D rendering benchmark suite.
 
 The Scirra WebGL performance test measures the number of 2D triangles
 represented onscreen when the animation reaches the 30 FPS threshold.
 """
 
 import os
 
 from telemetry import benchmark
 from telemetry.page import page_measurement
 from telemetry.page import page_set
+from telemetry.value import scalar
 
 
 class _ScirraMeasurement(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = 'window.sprites = 0;'
 
   def MeasurePage(self, _, tab, results):
     object_count = '$objectcount$'
     fps = '$fps$'
@@ skipping 14 matching lines @@
             window.sprites = window.cr_getC2Runtime().%(object_count)s;
             return true;
           } else {
             return false;
           }
         };
         IsTestDone();
         """ % {'tickcount': tickcount, 'fps': fps, 'object_count': object_count}
     tab.WaitForJavaScriptExpression(js_is_done, 300)
     total = int(tab.EvaluateJavaScript('window.sprites'))
-    results.Add('Count', 'count', total)
-
+    results.AddValue(scalar.ScalarValue(
+      results.current_page, 'Count', 'count', total))
 
 @benchmark.Disabled
 class ScirraBenchmark(benchmark.Benchmark):
   """WebGL and Canvas2D rendering benchmark suite."""
   test = _ScirraMeasurement
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
         archive_data_file='../page_sets/data/scirra.json',
         make_javascript_deterministic=False,
         file_path=os.path.abspath(__file__))
     for url in ('http://www.scirra.com/labs/renderperf3/',
                 'http://www.scirra.com/demos/c2/renderperfgl/',
                 'http://www.scirra.com/demos/c2/renderperf2d/'):
       ps.AddPageWithDefaultRunNavigate(url)
     return ps