Telemetry: Quiescent power benchmarks for Mac

tools/perf/measurements/page_cycler_unittest.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.
 
 import sys
 import unittest
 
 from telemetry.core import browser_options
 from telemetry.results import page_test_results
 from telemetry.unittest_util import simple_mock
@@ skipping 209 matching lines @@
         results = page_test_results.PageTestResults()
         results.WillRunPage(page)
         cycler.WillNavigateToPage(page, tab)
         cycler.ValidateAndMeasurePage(page, tab, results)
         results.DidRunPage(page)
 
         values = results.all_page_specific_values
 
         # On Mac, there is an additional measurement: the number of keychain
         # accesses.
-        value_count = 4
+        value_count = 3
         if sys.platform == 'darwin':
           value_count += 1
         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')
 
-        expected_values = ['gpu', 'renderer', 'browser']
+        expected_values = ['gpu', 'browser']
         for value, expected in zip(values[1:len(expected_values) + 1],
             expected_values):
           self.assertEqual(value.page, page)
           self.assertEqual(value.name,
                            'cpu_utilization.cpu_utilization_%s' % expected)
           self.assertEqual(value.units, '%')
 
         cycler.DidNavigateToPage(page, tab)
 
   def testLegacyPagesAvoidCrossRenderNavigation(self):
     # For legacy page cyclers with file URLs, verify that WillNavigateToPage
     # does an initial navigate to avoid paying for a cross-renderer navigation.
     cycler = self.SetUpCycler(setup_memory_module=True)
     pages = [FakePage('file://fakepage1.com'), FakePage('file://fakepage2.com')]
     tab = FakeTab()
 
     self.assertEqual([], tab.navigated_urls)
     for page in pages * 2:
       cycler.WillNavigateToPage(page, tab)
       self.assertEqual(
           ['http://fakeserver:99999/nonexistent.html'], tab.navigated_urls)