mac: Expose keychain access frequency to Telemetry.

tools/perf/benchmarks/service_worker.py

Index: tools/perf/benchmarks/service_worker.py
diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py
index 6fc90a5e7328efe3d62581fc10bb47eaa54df2a1..2d03dd27f02f6c5bcad48b90d7026fd2000438b2 100644
--- a/tools/perf/benchmarks/service_worker.py
+++ b/tools/perf/benchmarks/service_worker.py
@@ -6,11 +6,11 @@ import collections
 import page_sets
 import re
 
+from measurements import PageTestMeasurement
 from measurements import timeline_controller
 from metrics import speedindex
 from telemetry import benchmark
 from telemetry.core import util
-from telemetry.page import page_test
 from telemetry.timeline import async_slice as async_slice_module
 from telemetry.timeline import slice as slice_module
 from telemetry.value import scalar
@@ -82,7 +82,7 @@ class _ServiceWorkerTimelineMetric(object):
         results.current_page, full_name + '_avg', 'ms', total / len(times)))
 
 
-class _ServiceWorkerMeasurement(page_test.PageTest):
+class _ServiceWorkerMeasurement(PageTestMeasurement):
   """Measure Speed Index and TRACE_EVENTs"""
 
   def __init__(self, *args, **kwargs):
@@ -92,6 +92,7 @@ class _ServiceWorkerMeasurement(page_test.PageTest):
     self._page_open_times = collections.defaultdict(int)
 
   def CustomizeBrowserOptions(self, options):
+    super(_ServiceWorkerMeasurement, self).CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs([
         '--enable-experimental-web-platform-features'
       ])
@@ -115,6 +116,8 @@ class _ServiceWorkerMeasurement(page_test.PageTest):
                   'DispatchFetchEvent)'
     timeline_metric.AddResultsOfEvents(
         browser_process, 'IOThread', filter_text , results)
+    super(_ServiceWorkerMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
 
     # Record Speed Index
     def SpeedIndexIsFinished():
@@ -134,7 +137,7 @@ class _ServiceWorkerMeasurement(page_test.PageTest):
     self._speed_index.AddResults(tab, results, chart_prefix)
 
 
-class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest):
+class _ServiceWorkerMicroBenchmarkMeasurement(PageTestMeasurement):
   """Measure JS land values and TRACE_EVENTs"""
 
   def __init__(self, *args, **kwargs):
@@ -143,6 +146,8 @@ class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest):
     self._timeline_controller = timeline_controller.TimelineController()
 
   def CustomizeBrowserOptions(self, options):
+    super(_ServiceWorkerMicroBenchmarkMeasurement, self).\
+        CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs([
         '--enable-experimental-web-platform-features'
       ])
@@ -171,6 +176,8 @@ class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest):
                   'DispatchFetchEvent)'
     timeline_metric.AddResultsOfEvents(
         browser_process, 'IOThread', filter_text , results)
+    super(_ServiceWorkerMicroBenchmarkMeasurement, self).ValidateAndMeasurePage(
+        page, tab, results)
 
 
 @benchmark.Enabled('android')