| Index: tools/perf/benchmarks/speedometer.py
|
| diff --git a/tools/perf/benchmarks/speedometer.py b/tools/perf/benchmarks/speedometer.py
|
| index 8af1db18b458039e3649c78cbc3537e0ea201dda..b4b12bfd18777f9c71c28aedc43375c889b86008 100644
|
| --- a/tools/perf/benchmarks/speedometer.py
|
| +++ b/tools/perf/benchmarks/speedometer.py
|
| @@ -56,7 +56,7 @@ class SpeedometerMeasurement(legacy_page_test.LegacyPageTest):
|
| if tab.browser.platform.GetOSName() == 'android':
|
| iterationCount = 3
|
|
|
| - tab.ExecuteJavaScript2("""
|
| + tab.ExecuteJavaScript("""
|
| // Store all the results in the benchmarkClient
|
| benchmarkClient._measuredValues = []
|
| benchmarkClient.didRunSuites = function(measuredValues) {
|
| @@ -67,19 +67,19 @@ class SpeedometerMeasurement(legacy_page_test.LegacyPageTest):
|
| startTest();
|
| """,
|
| count=iterationCount)
|
| - tab.WaitForJavaScriptCondition2(
|
| + tab.WaitForJavaScriptCondition(
|
| 'benchmarkClient._finishedTestCount == benchmarkClient.testsCount',
|
| timeout=600)
|
| results.AddValue(list_of_scalar_values.ListOfScalarValues(
|
| page, 'Total', 'ms',
|
| - tab.EvaluateJavaScript2('benchmarkClient._timeValues'),
|
| + tab.EvaluateJavaScript('benchmarkClient._timeValues'),
|
| important=True))
|
|
|
| # Extract the timings for each suite
|
| for suite_name in self.enabled_suites:
|
| results.AddValue(list_of_scalar_values.ListOfScalarValues(
|
| page, suite_name, 'ms',
|
| - tab.EvaluateJavaScript2("""
|
| + tab.EvaluateJavaScript("""
|
| var suite_times = [];
|
| for(var i = 0; i < benchmarkClient.iterationCount; i++) {
|
| suite_times.push(
|
|
|