mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/spaceport.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 spaceport.io's PerfMarks benchmark."""
 
 import logging
 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
 from telemetry.value import scalar
 
 DESCRIPTIONS = {
     'canvasDrawImageFullClear':
         'Using a canvas element to render. Bitmaps are blitted to the canvas '
         'using the "drawImage" function and the canvas is fully cleared at '
         'the beginning of each frame.',
     'canvasDrawImageFullClearAlign':
         'Same as canvasDrawImageFullClear except all "x" and "y" values are '
@@ skipping 15 matching lines @@
     'css2dImg':
         'Same as css2dBackground, but using img elements instead of div '
         'elements.',
     'css3dBackground':
         'Same as css2dBackground, but using CSS-3D transforms.',
     'css3dImg':
         'Same as css2dImage but using CSS-3D tranforms.',
 }
 
 
-class _SpaceportMeasurement(page_test.PageTest):
+class _SpaceportMeasurement(PageTestMeasurement):
   def __init__(self):
     super(_SpaceportMeasurement, self).__init__()
 
   def CustomizeBrowserOptions(self, options):
+    super(_SpaceportMeasurement, self).CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs('--disable-gpu-vsync')
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression(
         '!document.getElementById("start-performance-tests").disabled', 60)
 
     tab.ExecuteJavaScript("""
         window.__results = {};
         window.console.log = function(str) {
             if (!str) return;
@@ skipping 19 matching lines @@
     for key in result_dict:
       chart, trace = key.split('.', 1)
       results.AddValue(scalar.ScalarValue(
           results.current_page, '%s.%s'% (chart, trace),
           'objects (bigger is better)', float(result_dict[key]),
           important=False, description=DESCRIPTIONS.get(chart)))
     results.AddValue(list_of_scalar_values.ListOfScalarValues(
         results.current_page, 'Score', 'objects (bigger is better)',
         [float(x) for x in result_dict.values()],
         description='Combined score for all parts of the spaceport benchmark.'))
+    super(_SpaceportMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
 
 
 # crbug.com/166703: This test frequently times out on Windows.
 @benchmark.Disabled('mac', 'win')
 class Spaceport(benchmark.Benchmark):
   """spaceport.io's PerfMarks benchmark."""
   test = _SpaceportMeasurement
 
   def CreatePageSet(self, options):
     spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test',
         'data', 'third_party', 'spaceport')
     ps = page_set.PageSet(file_path=spaceport_dir)
     ps.AddPageWithDefaultRunNavigate('file://index.html')
     return ps