[telemetry] More fixes for my page_test_result rewrite

tools/telemetry/telemetry/page_benchmark_results.py

 # Copyright (c) 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.
 from collections import defaultdict
 from telemetry.page_test import PageTestResults
 from telemetry.perf_tests_helper import PrintPerfResult
 from telemetry.page_benchmark_value import PageBenchmarkValue
 
 class ValuesForSinglePage(object):
   def __init__(self, page):
     self.page = page
     self.values = []
 
   def AddValue(self, value):
     self.values.append(value)
 
   @property
   def measurement_names(self):
     return [value.measurement_name for value in self.values]
 
   def FindValueByMeasurementName(self, measurement_name):
     values = [value for value in self.values
               if value.measurement_name == measurement_name]
     assert len(values) <= 1
     if len(values):
       return values[0]
     return None
 
+  def __getitem__(self, trace_name):
+    return self.FindValueByTraceName(trace_name)
+
+  def __contains__(self, trace_name):
+    return self.FindValueByTraceName(trace_name) != None
+
+  def FindValueByTraceName(self, trace_name):
+    values = [value for value in self.values
+              if value.trace_name == trace_name]
+    assert len(values) <= 1
+    if len(values):
+      return values[0]
+    return None
+
 class PageBenchmarkResults(PageTestResults):
   def __init__(self):
     super(PageBenchmarkResults, self).__init__()
-    self._all_values_for_all_pages = []
+    self._page_results = []
 
     self._all_measurements_that_have_been_seen = {}
 
     self._values_for_current_page = {}
 
+  def __getitem__(self, i):
+    """Shorthand for self.page_results[i]"""
+    return self._page_results[i]
+
+  def __len__(self):
+    return len(self._page_results)
+
   @property
   def values_for_current_page(self):
     return self._values_for_current_page
 
   @property
-  def all_values_for_all_pages(self):
-    return self._all_values_for_all_pages
+  def page_results(self):
+    return self._page_results
 
   def WillMeasurePage(self, page):
     self._values_for_current_page = ValuesForSinglePage(page)
 
   @property
   def all_measurements_that_have_been_seen(self):
     return self._all_measurements_that_have_been_seen
 
   def Add(self, trace_name, units, value, chart_name=None, data_type='default'):
     value = PageBenchmarkValue(trace_name, units, value, chart_name, data_type)
@@ skipping 12 matching lines @@
           'Unit cannot change for a name once it has been provided'
     else:
       self._all_measurements_that_have_been_seen[measurement_name] = {
         'units': units,
         'type': data_type}
 
     self._values_for_current_page.AddValue(value)
 
   def DidMeasurePage(self):
     assert self._values_for_current_page, 'Failed to call WillMeasurePage'
-    self._all_values_for_all_pages.append(self._values_for_current_page)
+    self._page_results.append(self._values_for_current_page)
     self._values_for_current_page = None
 
   def _PrintPerfResult(self, measurement, trace, values, units,
                        result_type='default'):
     PrintPerfResult(measurement, trace, values, units, result_type)
 
   def PrintSummary(self, trace_tag):
     if self.page_failures:
       return
 
     # Build the results summary.
     results_summary = defaultdict(list)
     for measurement_name in \
           self._all_measurements_that_have_been_seen.iterkeys():
-      for page_values in self._all_values_for_all_pages:
+      for page_values in self._page_results:
         value = page_values.FindValueByMeasurementName(measurement_name)
         if not value:
           continue
         measurement_units_type = (measurement_name,
                                   value.units,
                                   value.data_type)
         value_url = (value.output_value, page_values.page.url)
         results_summary[measurement_units_type].append(value_url)
 
     # Output the results summary sorted by name, then units, then data type.
@@ skipping 16 matching lines @@
       if not trace_tag:
         for value, url in value_url_list:
           self._PrintPerfResult(measurement + '_by_url', url, [value], units,
                                 by_url_data_type)
 
       # For histograms, we don't print the average data, only the _by_url.
       if not data_type == 'histogram':
         values = [i[0] for i in value_url_list]
         self._PrintPerfResult(measurement, trace, values, units, data_type)