mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/peacekeeper.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.
 
 """PeaceKeeper benchmark suite.
 
 Peacekeeper measures browser's performance by testing its JavaScript
 functionality. JavaScript is a widely used programming language used in the
 creation of modern websites to provide features such as animation, navigation,
 forms and other common requirements. By measuring a browser's ability to handle
 commonly used JavaScript functions Peacekeeper can evaluate its performance.
 Peacekeeper scores are measured in operations per second or rendered frames per
 second depending on the test. Final Score is computed by calculating geometric
 mean of individual tests scores.
 """
 
+from measurements import PageTestMeasurement
 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 merge_values
 from telemetry.value import scalar
 
 
-class _PeaceKeeperMeasurement(page_test.PageTest):
+class _PeaceKeeperMeasurement(PageTestMeasurement):
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = """
         var __results = {};
         var _done = false;
         var __real_log = window.console.log;
         var test_frame = null;
         var benchmark = null;
         window.console.log = function(msg) {
           if (typeof(msg) == "string" && (msg.indexOf("benchmark")) == 0) {
             test_frame = document.getElementById("testFrame");
             benchmark =  test_frame.contentWindow.benchmark;
             test_frame.contentWindow.onbeforeunload = {};
             if ((msg.indexOf("Submit ok.")) != -1) {
               _done = true;
               __results["test"] = benchmark.testObjectName;
               __results["score"] = benchmark.test.result;
               if (typeof(benchmark.test.unit) != "undefined") {
                 __results["unit"] = benchmark.test.unit;
               } else {
                 __results["unit"] = benchmark.test.isFps ? "fps" : "ops";
               }
             }
           }
           __real_log.apply(this, [msg]);
         }
         """
 
-  def ValidateAndMeasurePage(self, _, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression('_done', 600)
     result = tab.EvaluateJavaScript('__results')
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, '%s.Score' % result['test'], 'score',
         int(result['score'])), important=False)
+    super(_PeaceKeeperMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
 
   def DidRunTest(self, browser, results):
     # Calculate geometric mean as the total for the combined tests.
     combined = merge_values.MergeLikeValuesFromDifferentPages(
         results.all_page_specific_values,
         group_by_name_suffix=True)
     combined_score = [x for x in combined if x.name == 'Score'][0]
     total = statistics.GeometricMean(combined_score.values)
     results.AddSummaryValue(
         scalar.ScalarValue(None, 'Total.Score', 'score', total))
@@ skipping 177 matching lines @@
   tag = 'html5'
   test_param = ['webglSphere',
                 'gamingSpitfire',
                 'videoCodecH264',
                 'videoCodecTheora',
                 'videoCodecWebM',
                 'videoPosterSupport',
                 'workerContrast01',
                 'workerContrast02'
                 ]