telemetry: separated stats collection from metrics calculation.

tools/perf/measurements/smoothness.py

 # Copyright (c) 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.
 from metrics import loading
 from metrics import smoothness
+from metrics.benchmark_stats import MakeBenchmarkStats
 from telemetry.page import page_measurement
 
 class DidNotScrollException(page_measurement.MeasurementFailure):
   def __init__(self):
     super(DidNotScrollException, self).__init__('Page did not scroll')
 
 class MissingDisplayFrameRate(page_measurement.MeasurementFailure):
   def __init__(self, name):
     super(MissingDisplayFrameRate, self).__init__(
         'Missing display frame rate metrics: ' + name)
@@ skipping 36 matching lines @@
 
   def MeasurePage(self, page, tab, results):
     rendering_stats_deltas = self._metrics.deltas
 
     if not (rendering_stats_deltas['numFramesSentToScreen'] > 0):
       raise DidNotScrollException()
 
     loading.AddResultsForTab(tab, results)
 
     smoothness.CalcFirstPaintTimeResults(results, tab)
-    smoothness.CalcScrollResults(rendering_stats_deltas, results)
-    smoothness.CalcTextureUploadResults(rendering_stats_deltas, results)
-    smoothness.CalcImageDecodingResults(rendering_stats_deltas, results)
-    smoothness.CalcAnalysisResults(rendering_stats_deltas, results)
-    smoothness.CalcLatencyResults(rendering_stats_deltas, results)
+
+    benchmark_stats = MakeBenchmarkStats(rendering_stats_deltas)
+    smoothness.CalcResults(benchmark_stats, results)
 
     if self.options.report_all_results:
       for k, v in rendering_stats_deltas.iteritems():
         results.Add(k, '', v)
 
     if tab.browser.platform.IsRawDisplayFrameRateSupported():
       for r in tab.browser.platform.GetRawDisplayFrameRateMeasurements():
         if r.value is None:
           raise MissingDisplayFrameRate(r.name)
         results.Add(r.name, r.unit, r.value)