| Index: tools/perf/benchmarks/octane.py
|
| diff --git a/tools/perf/benchmarks/octane.py b/tools/perf/benchmarks/octane.py
|
| index 98ec3da793acbf0c43d61e1e5ce919d269292083..95b68941e752bfcf65653d0f41a3413e5ad532ec 100644
|
| --- a/tools/perf/benchmarks/octane.py
|
| +++ b/tools/perf/benchmarks/octane.py
|
| @@ -99,14 +99,14 @@ class _OctaneMeasurement(legacy_page_test.LegacyPageTest):
|
| self._power_metric.Start(page, tab)
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| - tab.WaitForJavaScriptCondition2('window.completed', timeout=10)
|
| - tab.WaitForJavaScriptCondition2(
|
| + tab.WaitForJavaScriptCondition('window.completed', timeout=10)
|
| + tab.WaitForJavaScriptCondition(
|
| '!document.getElementById("progress-bar-container")', timeout=1200)
|
|
|
| self._power_metric.Stop(page, tab)
|
| self._power_metric.AddResults(tab, results)
|
|
|
| - results_log = tab.EvaluateJavaScript2('__results')
|
| + results_log = tab.EvaluateJavaScript('__results')
|
| all_scores = []
|
| for output in results_log:
|
| # Split the results into score and test name.
|
|
|