Convert results.Add to results.AddValue for speedindex metrics.

tools/perf/metrics/speedindex.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.
 
 import collections
 
 from metrics import Metric
 from telemetry.core import bitmap
+from telemetry.value import scalar
 
 
 class SpeedIndexMetric(Metric):
   """The speed index metric is one way of measuring page load speed.
 
   It is meant to approximate user perception of page load speed, and it
   is based on the amount of time that it takes to paint to the visual
   portion of the screen. It includes paint events that occur after the
   onload event, and it doesn't include time loading things off-screen.
 
@@ skipping 25 matching lines @@
     assert self.IsFinished(tab), 'Must wait for IsFinished() before Stop()'
     self._impl.Stop(tab)
 
   # Optional argument chart_name is not in base class Metric.
   # pylint: disable=W0221
   def AddResults(self, tab, results, chart_name=None):
     """Calculate the speed index and add it to the results."""
     index = self._impl.CalculateSpeedIndex(tab)
     # Release the tab so that it can be disconnected.
     self._impl = None
-    results.Add('speed_index', 'ms', index, chart_name=chart_name)
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, '%s.speed_index' % chart_name, 'ms', index))
 
   def IsFinished(self, tab):
     """Decide whether the timeline recording should be stopped.
 
     When the timeline recording is stopped determines which paint events
     are used in the speed index metric calculation. In general, the recording
     should continue if there has just been some data received, because
     this suggests that painting may continue.
 
     A page may repeatedly request resources in an infinite loop; a timeout
@@ skipping 231 matching lines @@
     frame = paint_event.args['frameId']
     return (frame,) + GetBox(paint_event.args['data']['clip'])
 
   def _GroupEventByRectangle(self, paint_events):
     """Group all paint events according to the rectangle that they update."""
     result = collections.defaultdict(list)
     for event in paint_events:
       assert event.name == 'Paint'
       result[self._GetRectangle(event)].append(event)
     return result