| Index: tools/perf/benchmarks/sunspider.py
|
| diff --git a/tools/perf/benchmarks/sunspider.py b/tools/perf/benchmarks/sunspider.py
|
| index a504426df60c7f261daf7c414ce40a9792f847e2..888e194f5ce74c9d305aca9c5e514566e99da723 100644
|
| --- a/tools/perf/benchmarks/sunspider.py
|
| +++ b/tools/perf/benchmarks/sunspider.py
|
| @@ -91,14 +91,14 @@ class _SunspiderMeasurement(legacy_page_test.LegacyPageTest):
|
| self._power_metric.Start(page, tab)
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| - tab.WaitForJavaScriptCondition2(
|
| + tab.WaitForJavaScriptCondition(
|
| 'window.location.pathname.indexOf("results.html") >= 0'
|
| '&& typeof(output) != "undefined"', timeout=300)
|
|
|
| self._power_metric.Stop(page, tab)
|
| self._power_metric.AddResults(tab, results)
|
|
|
| - js_results = json.loads(tab.EvaluateJavaScript2('JSON.stringify(output);'))
|
| + js_results = json.loads(tab.EvaluateJavaScript('JSON.stringify(output);'))
|
|
|
| # Below, r is a map of benchmark names to lists of result numbers,
|
| # and totals is a list of totals of result numbers.
|
|
|