mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/kraken.py

 # Copyright 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.
 
 """Runs Mozilla's Kraken JavaScript benchmark."""
 
 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 list_of_scalar_values
 from telemetry.value import scalar
 
 DESCRIPTIONS = {
     'ai-astar':
         'This benchmark uses the [A* search algorithm]'
         '(http://en.wikipedia.org/wiki/A*_search_algorithm) to automatically '
         'plot an efficient path between two points, in the presence of '
         'obstacles. Adapted from code by [Brian Gringstead]'
         '(http://www.briangrinstead.com/blog/astar-search-algorithm-in-'
@@ skipping 35 matching lines @@
         'This benchmark serializes [Tinderbox]'
         '(http://tests.themasta.com/tinderboxpushlog/?tree=Firefox) build '
         'data to [JSON](http://www.json.org).',
 }
 
 
 def _Mean(l):
   return float(sum(l)) / len(l) if len(l) > 0 else 0.0
 
 
-class _KrakenMeasurement(page_test.PageTest):
+class _KrakenMeasurement(PageTestMeasurement):
   def __init__(self):
     super(_KrakenMeasurement, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
+    super(_KrakenMeasurement, 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 17 matching lines @@
           description=DESCRIPTIONS.get(key)))
       total += _Mean(result_dict[key])
 
     # TODO(tonyg/nednguyen): This measurement shouldn't calculate Total. The
     # results system should do that for us.
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'Total', 'ms', total,
         description='Total of the means of the results for each type '
                     'of benchmark in [Mozilla\'s Kraken JavaScript benchmark]'
                     '(http://krakenbenchmark.mozilla.org/)'))
+    super(_KrakenMeasurement, self).ValidateAndMeasurePage(page, tab, results)
 
 
 class Kraken(benchmark.Benchmark):
   """Mozilla's Kraken JavaScript benchmark."""
   test = _KrakenMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/kraken.json',
       file_path=os.path.abspath(__file__))
     ps.AddPageWithDefaultRunNavigate(
       'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html')
     return ps