mac: Expose keychain access frequency to Telemetry.

tools/perf/measurements/page_cycler_unittest.py

Index: tools/perf/measurements/page_cycler_unittest.py
diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py
index 164e69f21ca19849cb9a05709be56dcd408231c6..c032aae7214050568513106399af82e4414dad7e 100644
--- a/tools/perf/measurements/page_cycler_unittest.py
+++ b/tools/perf/measurements/page_cycler_unittest.py
@@ -2,8 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import sys
 import unittest
 
+from metrics import keychain_metric
 from telemetry.core import browser_options
 from telemetry.results import page_test_results
 from telemetry.unittest_util import simple_mock
@@ -49,7 +51,15 @@ class FakeTab(object):
   def ClearCache(self, force=False):
     assert force
     self.clear_cache_calls += 1
-  def EvaluateJavaScript(self, _):
+  def EvaluateJavaScript(self, script):
+    # If the page cycler invokes javascript to measure the number of keychain
+    # accesses, return a valid JSON dictionary.
+    get_keychain_script = 'statsCollectionController.getBrowserHistogram' \
+        '("{0}")'.format(keychain_metric.KeychainMetric.HISTOGRAM_NAME)
+    if script == get_keychain_script:

[jeremy, 2014/12/09 14:57:16]

# Fake data for keychain metric.
if keychain_histogram_name in script:
  return ....

[erikchen, 2014/12/13 02:39:58]

Done.

+      return '{{ "{0}" : 0 }}'.format(
+          keychain_metric.KeychainMetric.HISTOGRAM_NAME)
+
     return 1
   def Navigate(self, url):
     self.navigated_urls.append(url)
@@ -216,14 +226,20 @@ class PageCyclerUnitTest(unittest.TestCase):
         results.DidRunPage(page)
 
         values = results.all_page_specific_values
-        self.assertEqual(4, len(values))
+
+        # On Mac, there is an additional measurement: the number of keychain
+        # accesses.
+        value_count = 4
+        if sys.platform =='darwin':

[jeremy, 2014/12/09 14:57:16]

space after ==

[erikchen, 2014/12/13 02:39:58]

Done.

+          value_count = value_count + 1

[jeremy, 2014/12/09 14:57:16]

value_count += 1

[erikchen, 2014/12/13 02:39:58]

Done.

+        self.assertEqual(value_count, len(values))
 
         self.assertEqual(values[0].page, page)
         chart_name = 'cold_times' if i == 0 else 'warm_times'
         self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
         self.assertEqual(values[0].units, 'ms')
 
-        for value, expected in zip(values[1:], ['gpu', 'renderer', 'browser']):
+        for value, expected in zip(values[1:4], ['gpu', 'renderer', 'browser']):

[jeremy, 2014/12/09 14:57:16]

I don't like the hardcoded 4 here, how about:

foo = ['gpu', ...]
for ... in zip(values[1:len(foo)+1], foo)

[erikchen, 2014/12/13 02:39:58]

Done.

           self.assertEqual(value.page, page)
           self.assertEqual(value.name,
                            'cpu_utilization.cpu_utilization_%s' % expected)