Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / perf / benchmarks / dom_perf.py

diff --git a/src/tools/perf/benchmarks/dom_perf.py b/src/tools/perf/benchmarks/dom_perf.py
index d78bfd4..a20a254 100644 (file)
--- a/src/tools/perf/benchmarks/dom_perf.py
+++ b/src/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