| Index: tools/perf/benchmarks/browsermark.py
|
| diff --git a/tools/perf/benchmarks/browsermark.py b/tools/perf/benchmarks/browsermark.py
|
| index cfc98d3e6ee147d6e0a18bb2e76417c619221161..d5099f597124cd6f8150923d3aa50c0c2d217729 100644
|
| --- a/tools/perf/benchmarks/browsermark.py
|
| +++ b/tools/perf/benchmarks/browsermark.py
|
| @@ -20,14 +20,14 @@ tests are not included in this suite.
|
|
|
| import os
|
|
|
| +from measurements import PageTestMeasurement
|
| from telemetry import benchmark
|
| from telemetry.page import page_set
|
| -from telemetry.page import page_test
|
| from telemetry.value import scalar
|
|
|
| -class _BrowsermarkMeasurement(page_test.PageTest):
|
| +class _BrowsermarkMeasurement(PageTestMeasurement):
|
|
|
| - def ValidateAndMeasurePage(self, _, tab, results):
|
| + def ValidateAndMeasurePage(self, page, tab, results):
|
| # Select nearest server(North America=1) and start test.
|
| js_start_test = """
|
| for (var i=0; i < $('#continent a').length; i++) {
|
| @@ -45,6 +45,9 @@ class _BrowsermarkMeasurement(page_test.PageTest):
|
| results.AddValue(
|
| scalar.ScalarValue(results.current_page, 'Score', 'score', result))
|
|
|
| + super(_BrowsermarkMeasurement, self).ValidateAndMeasurePage(
|
| + page, tab, results)
|
| +
|
|
|
| @benchmark.Disabled
|
| class Browsermark(benchmark.Benchmark):
|
|
|