Index: tools/perf/benchmarks/browsermark.py |
diff --git a/tools/perf/benchmarks/browsermark.py b/tools/perf/benchmarks/browsermark.py |
index ac33464cfc65e0acc38afc70cb1a8d1262e25117..85953afece331bee70467aac5d9a355eb7a3b6d9 100644 |
--- a/tools/perf/benchmarks/browsermark.py |
+++ b/tools/perf/benchmarks/browsermark.py |
@@ -24,7 +24,6 @@ from telemetry import test |
from telemetry.page import page_measurement |
from telemetry.page import page_set |
- |
class _BrowsermarkMeasurement(page_measurement.PageMeasurement): |
def MeasurePage(self, _, tab, results): |
@@ -49,12 +48,9 @@ class Browsermark(test.Test): |
"""Browsermark suite tests CSS, DOM, resize, page load, WebGL and JS.""" |
test = _BrowsermarkMeasurement |
def CreatePageSet(self, options): |
- return page_set.PageSet.FromDict({ |
- 'archive_data_file': '../page_sets/data/browsermark.json', |
- 'make_javascript_deterministic': False, |
- 'pages': [ |
- { 'url': |
- 'http://browsermark.rightware.com/tests/'} |
- ] |
- }, os.path.abspath(__file__)) |
- |
+ ps = page_set.PageSet( |
+ file_path=os.path.abspath(__file__), |
+ archive_data_file='../page_sets/data/browsermark.json', |
+ make_javascript_deterministic=False) |
+ ps.AddPageWithDefaultRunNavigate('http://browsermark.rightware.com/tests/') |
+ return ps |