Cleanup of page_measurement_results object

tools/perf/benchmarks/peacekeeper.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.
 
 """PeaceKeeper benchmark suite.
 
 Peacekeeper measures browser's performance by testing its JavaScript
 functionality. JavaScript is a widely used programming language used in the
 creation of modern websites to provide features such as animation, navigation,
 forms and other common requirements. By measuring a browser's ability to handle
 commonly used JavaScript functions Peacekeeper can evaluate its performance.
 Peacekeeper scores are measured in operations per second or rendered frames per
 second depending on the test. Final Score is computed by calculating geometric
 mean of individual tests scores.
 """
 
 import os
 
 from metrics import statistics
 from telemetry import test
 from telemetry.page import page_measurement
 from telemetry.page import page_set
-
+from telemetry.value import merge_values
 
 class PeaceKeeperMeasurement(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = """
         var __results = {};
         var _done = false;
         var __real_log = window.console.log;
         var test_frame = null;
         var benchmark = null;
@@ skipping 19 matching lines @@
 
   def MeasurePage(self, _, tab, results):
     tab.WaitForJavaScriptExpression('_done', 600)
     result = tab.EvaluateJavaScript('__results')
 
     results.Add('Score', 'score', int(result['score']), result['test'],
                 'unimportant')
 
   def DidRunTest(self, browser, results):
     # Calculate geometric mean as the total for the combined tests.
-    scores = []
-    for result in results.page_results:
-      scores.append(result['Score'].output_value)
-    total = statistics.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'][0]
+    total = statistics.GeometricMean(combined_score.values)
     results.AddSummary('Score', 'score', total, 'Total')
 
 
 class PeaceKeeperBenchmark(test.Test):
   """A base class for Peackeeper benchmarks."""
   test = PeaceKeeperMeasurement
 
   def CreatePageSet(self, options):
     """Makes a PageSet for PeaceKeeper benchmarks."""
     # Subclasses are expected to define a class member called query_param.
@@ skipping 170 matching lines @@
   tag = 'html5'
   test_param = ['webglSphere',
                 'gamingSpitfire',
                 'videoCodecH264',
                 'videoCodecTheora',
                 'videoCodecWebM',
                 'videoPosterSupport',
                 'workerContrast01',
                 'workerContrast02'
                 ]
-