mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/dromaeo.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 math
 import os
 
+from measurements import PageTestMeasurement
 from metrics import power
 from telemetry import benchmark
 from telemetry.page import page_set
-from telemetry.page import page_test
 from telemetry.value import scalar
 
 
-class _DromaeoMeasurement(page_test.PageTest):
+class _DromaeoMeasurement(PageTestMeasurement):
   def __init__(self):
     super(_DromaeoMeasurement, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
+    super(_DromaeoMeasurement, self).CustomizeBrowserOptions(options)
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def WillStartBrowser(self, platform):
     self._power_metric = power.PowerMetric(platform)
 
   def DidNavigateToPage(self, page, tab):
     self._power_metric.Start(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression(
@@ skipping 54 matching lines @@
 
       top_name = data['collection'].split('-', 1)[0]
       AggregateData(aggregated, top_name, data['mean'])
 
       collection_name = data['collection']
       AggregateData(aggregated, collection_name, data['mean'])
 
     for key, value in aggregated.iteritems():
       AddResult(key, math.exp(value['sum'] / value['count']))
 
+    super(_DromaeoMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
+
 class _DromaeoBenchmark(benchmark.Benchmark):
   """A base class for Dromaeo benchmarks."""
   test = _DromaeoMeasurement
 
   def CreatePageSet(self, options):
     """Makes a PageSet for Dromaeo benchmarks."""
     # Subclasses are expected to define class members called query_param and
     # tag.
     if not hasattr(self, 'query_param') or not hasattr(self, 'tag'):
       raise NotImplementedError('query_param or tag not in Dromaeo benchmark.')
@@ skipping 90 matching lines @@
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'
 
 
 class DromaeoCSSQueryJquery(_DromaeoBenchmark):
   """Dromaeo CSS Query jquery JavaScript benchmark"""
   tag = 'cssqueryjquery'
   query_param = 'cssquery-jquery'