Get rid of page_set.FromDict from browsermark, canvasmark, dom_perf, html5gaming benchmarks.

BUG=239179

Review URL: https://codereview.chromium.org/245473002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266775 0039d316-1c4b-4281-b951-d872f2087c98

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

tools/perf/benchmarks/canvasmark.py

@@ -15,6 +15,7 @@ from telemetry import test
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
+
 class _CanvasMarkMeasurement(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
@@ -49,12 +50,10 @@ class CanvasMark(test.Test):
   test = _CanvasMarkMeasurement
 
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/canvasmark.json',
-        'make_javascript_deterministic': False,
-        'pages': [
-          { 'url':
-            'http://www.kevs3d.co.uk/dev/canvasmark/?auto=true'}
-          ]
-        }, os.path.abspath(__file__))
-
+    ps = page_set.PageSet(
+      file_path=os.path.abspath(__file__),
+      archive_data_file='../page_sets/data/canvasmark.json',
+      make_javascript_deterministic=False)
+    ps.AddPageWithDefaultRunNavigate(
+      'http://www.kevs3d.co.uk/dev/canvasmark/?auto=true')
+    return ps

tools/perf/benchmarks/dom_perf.py

@@ -80,18 +80,20 @@ class DomPerf(test.Test):
 
   def CreatePageSet(self, options):
     dom_perf_dir = os.path.join(util.GetChromiumSrcDir(), 'data', 'dom_perf')
-    base_page = 'file://run.html?reportInJS=1&run='
-    return page_set.PageSet.FromDict({
-        'pages': [
-          { 'url': base_page + 'Accessors' },
-          { 'url': base_page + 'CloneNodes' },
-          { 'url': base_page + 'CreateNodes' },
-          { 'url': base_page + 'DOMDivWalk' },
-          { 'url': base_page + 'DOMTable' },
-          { 'url': base_page + 'DOMWalk' },
-          { 'url': base_page + 'Events' },
-          { 'url': base_page + 'Get+Elements' },
-          { 'url': base_page + 'GridSort' },
-          { 'url': base_page + 'Template' }
-          ]
-        }, dom_perf_dir)
+    run_params = [
+      'Accessors',
+      'CloneNodes',
+      'CreateNodes',
+      'DOMDivWalk',
+      'DOMTable',
+      'DOMWalk',
+      'Events',
+      'Get+Elements',
+      'GridSort',
+      'Template'
+    ]
+    ps = page_set.PageSet(file_path=dom_perf_dir)
+    for param in run_params:
+      ps.AddPageWithDefaultRunNavigate(
+        'file://run.html?reportInJS=1&run=%s' % param)
+    return ps

tools/perf/benchmarks/html5gaming.py

@@ -16,7 +16,6 @@ from telemetry import test
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
-
 class _HTML5GamingMeasurement(page_measurement.PageMeasurement):
   def MeasurePage(self, _, tab, results):
     tab.ExecuteJavaScript('benchmark();')
@@ -33,12 +32,9 @@ class HTML5Gaming(test.Test):
   """Imapct HTML5 smooth running games benchmark suite."""
   test = _HTML5GamingMeasurement
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/html5gaming.json',
-        'make_javascript_deterministic': False,
-        'pages': [
-          { 'url':
-              'http://html5-benchmark.com/'}
-           ]
-        }, os.path.abspath(__file__))
-
+    ps = page_set.PageSet(
+      file_path=os.path.abspath(__file__),
+      archive_data_file='../page_sets/data/html5gaming.json',
+      make_javascript_deterministic=False)
+    ps.AddPageWithDefaultRunNavigate('http://html5-benchmark.com/')
+    return ps