Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: tools/perf/benchmarks/browsermark.py

Issue 245473002: Get rid of page_set.FromDict from browsermark, canvasmark, dom_perf, html5gaming benchmarks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/perf/benchmarks/canvasmark.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | tools/perf/benchmarks/canvasmark.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698