mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/blink_perf.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 os
 
+from measurements import PageTestMeasurement
 from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_set
-from telemetry.page import page_test
 from telemetry.value import list_of_scalar_values
 
 
 BLINK_PERF_BASE_DIR = os.path.join(util.GetChromiumSrcDir(),
                                    'third_party', 'WebKit', 'PerformanceTests')
 SKIPPED_FILE = os.path.join(BLINK_PERF_BASE_DIR, 'Skipped')
 
 
 def _CreatePageSetFromPath(path, skipped_file):
   assert os.path.exists(path)
@@ skipping 31 matching lines @@
           skipped.append(skipped_path.replace('/', os.sep))
     _AddDir(path, tuple(skipped))
   else:
     _AddPage(path)
   ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs)
   for url in page_urls:
     ps.AddPageWithDefaultRunNavigate(url)
   return ps
 
 
-class _BlinkPerfMeasurement(page_test.PageTest):
+class _BlinkPerfMeasurement(PageTestMeasurement):
   """Tuns a blink performance test and reports the results."""
   def __init__(self):
     super(_BlinkPerfMeasurement, self).__init__('')
     with open(os.path.join(os.path.dirname(__file__),
                            'blink_perf.js'), 'r') as f:
       self._blink_perf_js = f.read()
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = self._blink_perf_js
 
   def CustomizeBrowserOptions(self, options):
+    super(_BlinkPerfMeasurement, self).CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs([
         '--js-flags=--expose_gc',
         '--enable-experimental-web-platform-features',
         '--disable-gesture-requirement-for-media-playback'
     ])
 
   def ValidateAndMeasurePage(self, page, tab, results):
+    super(_BlinkPerfMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
     tab.WaitForJavaScriptExpression('testRunner.isDone', 600)
 
     log = tab.EvaluateJavaScript('document.getElementById("log").innerHTML')
 
     for line in log.splitlines():
       if not line.startswith('values '):
         continue
       parts = line.split()
       values = [float(v.replace(',', '')) for v in parts[1:-1]]
       units = parts[-1]
@@ skipping 114 matching lines @@
     return _CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 class BlinkPerfXMLHttpRequest(benchmark.Benchmark):
   tag = 'xml_http_request'
   test = _BlinkPerfMeasurement
 
   def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
     return _CreatePageSetFromPath(path, SKIPPED_FILE)