Cleanup of page_measurement_results object

tools/perf/benchmarks/dom_perf.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.
 
 import json
 import math
 import os
 
 from telemetry import test
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
+from telemetry.value import merge_values
 
 
 def _GeometricMean(values):
   """Compute a rounded geometric mean from an array of values."""
   if not values:
     return None
   # To avoid infinite value errors, make sure no value is less than 0.001.
   new_values = []
   for value in values:
     if value > 0.001:
@@ skipping 27 matching lines @@
       for suite in data['BenchmarkSuites']:
         # Skip benchmarks that we didn't actually run this time around.
         if len(suite['Benchmarks']) or suite['score']:
           results.Add(SCORE_TRACE_NAME, SCORE_UNIT,
                       suite['score'], suite['name'], 'unimportant')
     finally:
       tab.EvaluateJavaScript('document.cookie = "__domperf_finished=0"')
 
   def DidRunTest(self, browser, results):
     # Now give the geometric mean as the total for the combined runs.
-    scores = []
-    for result in results.page_results:
-      scores.append(result[SCORE_TRACE_NAME].output_value)
-    total = _GeometricMean(scores)
+    combined = merge_values.MergeLikeValuesFromDifferentPages(
+        results.all_page_specific_values,
+        group_by_name_suffix=True)
+    combined_score = [x for x in combined if x.name == SCORE_TRACE_NAME][0]
+    total = _GeometricMean(combined_score.values)
     results.AddSummary(SCORE_TRACE_NAME, SCORE_UNIT, total, 'Total')
 
 
 class DomPerf(test.Test):
   """A suite of JavaScript benchmarks for exercising the browser's DOM.
 
   The final score is computed as the geometric mean of the individual results.
   Scores are not comparable across benchmark suite versions and higher scores
   means better performance: Bigger is better!"""
   test = _DomPerfMeasurement
 
   def CreatePageSet(self, options):
     dom_perf_dir = os.path.join(util.GetChromiumSrcDir(), 'data', 'dom_perf')
     base_page = 'file://run.html?reportInJS=1&run='
     return page_set.PageSet.FromDict({
         'pages': [
           { 'url': base_page + 'Accessors' },
           { 'url': base_page + 'CloneNodes' },
           { 'url': base_page + 'CreateNodes' },
           { 'url': base_page + 'DOMDivWalk' },
           { 'url': base_page + 'DOMTable' },
           { 'url': base_page + 'DOMWalk' },
           { 'url': base_page + 'Events' },
           { 'url': base_page + 'Get+Elements' },
           { 'url': base_page + 'GridSort' },
           { 'url': base_page + 'Template' }
           ]
         }, dom_perf_dir)