Update page_cycler to use results.AddValue(...).

tools/perf/measurements/page_cycler.py

 # 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.
 
 """The page cycler measurement.
 
 This measurement registers a window load handler in which is forces a layout and
 then records the value of performance.now(). This call to now() measures the
 time from navigationStart (immediately after the previous page's beforeunload
 event) until after the layout in the page's load event. In addition, two garbage
 collections are performed in between the page loads (in the beforeunload event).
 This extra garbage collection time is not included in the measurement times.
 
 Finally, various memory and IO statistics are gathered at the very end of
 cycling all pages.
 """
 
 import collections
 import os
 
 from metrics import cpu
 from metrics import iometric
 from metrics import memory
 from metrics import power
 from metrics import speedindex
 from metrics import v8_object_stats
 from telemetry.core import util
 from telemetry.page import page_measurement
+from telemetry.value import scalar
+
 
 class PageCycler(page_measurement.PageMeasurement):
   options = {'pageset_repeat': 10}
 
   def __init__(self, *args, **kwargs):
     super(PageCycler, self).__init__(*args, **kwargs)
 
     with open(os.path.join(os.path.dirname(__file__),
                            'page_cycler.js'), 'r') as f:
       self._page_cycler_js = f.read()
@@ skipping 82 matching lines @@
       v8_object_stats.V8ObjectStatsMetric.CustomizeBrowserOptions(options)
     if self._report_speed_index:
       self._speedindex_metric.CustomizeBrowserOptions(options)
 
   def MeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression('__pc_load_time', 60)
 
     chart_name_prefix = ('cold_' if self.IsRunCold(page.url) else
                          'warm_')
 
-    results.Add('page_load_time', 'ms',
-                int(float(tab.EvaluateJavaScript('__pc_load_time'))),
-                chart_name=chart_name_prefix+'times')
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, '%stimes.page_load_time' % chart_name_prefix,
+        'ms', int(float(tab.EvaluateJavaScript('__pc_load_time')))))

[tonyg, 2014/07/11 02:12:16]

Not sure, but can we get rid of the int(float()) thing now?

[nednguyen, 2014/07/11 03:10:39]

Done.

 
     self._has_loaded_page[page.url] += 1
 
     self._power_metric.Stop(page, tab)
     self._memory_metric.Stop(page, tab)
     self._memory_metric.AddResults(tab, results)
     self._power_metric.AddResults(tab, results)
 
     self._cpu_metric.Stop(page, tab)
     self._cpu_metric.AddResults(tab, results)
@@ skipping 21 matching lines @@
     # preserve any initial profile cache for as long as possible.
     # The second is that, if we did cold runs first, we'd have a transition
     # page set during which we wanted the run for each URL to both
     # contribute to the cold data and warm the catch for the following
     # warm run, and clearing the cache before the load of the following
     # URL would eliminate the intended warmup for the previous URL.
     return (self._has_loaded_page[url] >= self._cold_run_start_index)
 
   def results_are_the_same_on_every_page(self):
     return False