mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/sunspider.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 collections
 import json
 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
 
 
 _URL = 'http://www.webkit.org/perf/sunspider-1.0.2/sunspider-1.0.2/driver.html'
 
 DESCRIPTIONS = {
     '3d-cube':
         'Pure JavaScript computations of the kind you might use to do 3d '
         'rendering, but without the rendering. This ends up mostly hitting '
         'floating point math and array access.',
@@ skipping 43 matching lines @@
     'math-spectral-norm': 'Various mathematical type computations.',
     'regexp-dna': 'Regular expressions performance.',
     'string-base64': 'String processing.',
     'string-fasta': 'String processing',
     'string-tagcloud': 'String processing code to generate a giant "tagcloud".',
     'string-unpack-code': 'String processing code to extracting compressed JS.',
     'string-validate-input': 'String processing.',
 }
 
 
-class _SunspiderMeasurement(page_test.PageTest):
+class _SunspiderMeasurement(PageTestMeasurement):
   def __init__(self):
     super(_SunspiderMeasurement, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
+    super(_SunspiderMeasurement, 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 23 matching lines @@
         total += value
       totals.append(total)
     for key, values in r.iteritems():
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           results.current_page, key, 'ms', values, important=False,
           description=DESCRIPTIONS.get(key)))
     results.AddValue(list_of_scalar_values.ListOfScalarValues(
         results.current_page, 'Total', 'ms', totals,
         description='Totals of run time for each different type of benchmark '
                     'in sunspider'))
+    super(_SunspiderMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
 
 
 class Sunspider(benchmark.Benchmark):
   """Apple's SunSpider JavaScript benchmark."""
   test = _SunspiderMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/sunspider.json',
       make_javascript_deterministic=False,
       file_path=os.path.abspath(__file__))
     ps.AddPageWithDefaultRunNavigate(_URL)
     return ps