mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/octane.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 Octane 2.0 javascript benchmark.
 
 Octane 2.0 is a modern benchmark that measures a JavaScript engine's performance
 by running a suite of tests representative of today's complex and demanding web
 applications. Octane's goal is to measure the performance of JavaScript code
 found in large, real-world web applications.
 Octane 2.0 consists of 17 tests, four more than Octane v1.
 """
 
 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.util import statistics
 from telemetry.value import scalar
 
 _GB = 1024 * 1024 * 1024
 
 DESCRIPTIONS = {
   'CodeLoad':
       'Measures how quickly a JavaScript engine can start executing code '
       'after loading a large JavaScript program, social widget being a common '
       'example. The source for test is derived from open source libraries '
@@ skipping 27 matching lines @@
       '(1761 lines).',
   'Richards':
       'OS kernel simulation benchmark, originally written in BCPL by Martin '
       'Richards (539 lines).',
   'Splay':
       'Data manipulation benchmark that deals with splay trees and exercises '
       'the automatic memory management subsystem (394 lines).',
 }
 
 
-class _OctaneMeasurement(page_test.PageTest):
+class _OctaneMeasurement(PageTestMeasurement):
   def __init__(self):
     super(_OctaneMeasurement, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
+    super(_OctaneMeasurement, self).CustomizeBrowserOptions(options)
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def WillStartBrowser(self, platform):
     self._power_metric = power.PowerMetric(platform)
 
   def WillNavigateToPage(self, page, tab):
     memory_stats = tab.browser.memory_stats
     if ('SystemTotalPhysicalMemory' in memory_stats and
         memory_stats['SystemTotalPhysicalMemory'] < 1 * _GB):
       skipBenchmarks = '"zlib"'
@@ skipping 35 matching lines @@
             description=DESCRIPTIONS.get(name)))
 
         # Collect all test scores to compute geometric mean.
         all_scores.append(score)
     total = statistics.GeometricMean(all_scores)
     results.AddSummaryValue(
         scalar.ScalarValue(None, 'Total.Score', 'score', total,
                            description='Geometric mean of the scores of each '
                                        'individual benchmark in the Octane '
                                        'benchmark collection.'))
+    super(_OctaneMeasurement, self).ValidateAndMeasurePage(page, tab, results)
 
 
 class Octane(benchmark.Benchmark):
   """Google's Octane JavaScript benchmark."""
   test = _OctaneMeasurement
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       archive_data_file='../page_sets/data/octane.json',
       make_javascript_deterministic=False,
       file_path=os.path.abspath(__file__))
     ps.AddPageWithDefaultRunNavigate(
       'http://octane-benchmark.googlecode.com/svn/latest/index.html?auto=1')
     return ps