| Index: tools/perf/measurements/page_cycler.py
|
| diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py
|
| index 1f9f63f03b3c471f8069b64efdf832f165e0948e..927e4ddff3079103f5a7e47f8a49e355c8fd9c00 100644
|
| --- a/tools/perf/measurements/page_cycler.py
|
| +++ b/tools/perf/measurements/page_cycler.py
|
| @@ -20,6 +20,7 @@ import os
|
|
|
| from metrics import cpu
|
| from metrics import iometric
|
| +from metrics import keychain_metric
|
| from metrics import memory
|
| from metrics import power
|
| from metrics import speedindex
|
| @@ -49,6 +50,7 @@ class PageCycler(page_test.PageTest):
|
| self._v8_object_stats_metric = None
|
| self._has_loaded_page = collections.defaultdict(int)
|
| self._initial_renderer_url = None # to avoid cross-renderer navigation
|
| + self._in_unit_test = False
|
|
|
| cold_runs_percent_set = (cold_load_percent != None)
|
| # Handle requests for cold cache runs
|
| @@ -69,6 +71,10 @@ class PageCycler(page_test.PageTest):
|
| else:
|
| self._cold_run_start_index = pageset_repeat * page_repeat
|
|
|
| + def SetInUnitTest(self, in_unit_test):
|
| + """Setter for the property |_in_unit_test|."""
|
| + self._in_unit_test = in_unit_test
|
| +
|
| def WillStartBrowser(self, platform):
|
| """Initialize metrics once right before the browser has been launched."""
|
| self._power_metric = power.PowerMetric(platform)
|
| @@ -113,6 +119,10 @@ class PageCycler(page_test.PageTest):
|
| if self._report_speed_index:
|
| self._speedindex_metric.CustomizeBrowserOptions(options)
|
|
|
| + if (keychain_metric.KeychainMetric.ShouldCollectKeychainMetrics()
|
| + and not self._in_unit_test):
|
| + keychain_metric.KeychainMetric.CustomizeBrowserOptions(options)
|
| +
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| tab.WaitForJavaScriptExpression('__pc_load_time', 60)
|
|
|
| @@ -149,6 +159,9 @@ class PageCycler(page_test.PageTest):
|
| self._speedindex_metric.Stop(page, tab)
|
| self._speedindex_metric.AddResults(
|
| tab, results, chart_name=chart_name_prefix+'speed_index')
|
| + if (keychain_metric.KeychainMetric.ShouldCollectKeychainMetrics()
|
| + and not self._in_unit_test):
|
| + keychain_metric.KeychainMetric().AddResults(tab, results)
|
|
|
| def DidRunTest(self, browser, results):
|
| iometric.IOMetric().AddSummaryResults(browser, results)
|
|
|