Get rid of FromDict from robohornet_pro, scirra, spaceport, sunspider

tools/perf/benchmarks/scirra.py

Index: tools/perf/benchmarks/scirra.py
diff --git a/tools/perf/benchmarks/scirra.py b/tools/perf/benchmarks/scirra.py
index 08511cfd982088a893252452fc4095197e4317f0..b3ba56cfabd5bae753062581fd96cd56739765fd 100644
--- a/tools/perf/benchmarks/scirra.py
+++ b/tools/perf/benchmarks/scirra.py
@@ -54,13 +54,15 @@ class ScirraBenchmark(test.Test):
   """WebGL and Canvas2D rendering benchmark suite."""
   test = _ScirraMeasurement
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/scirra.json',
-        'make_javascript_deterministic': False,
-        'pages': [
-            { 'url': 'http://www.scirra.com/labs/renderperf3/'},
-            { 'url': 'http://www.scirra.com/demos/c2/renderperfgl/'},
-            { 'url': 'http://www.scirra.com/demos/c2/renderperf2d/'}
-          ]
-        }, os.path.abspath(__file__))
+    ps = page_set.PageSet(
+        archive_data_file='../page_sets/data/scirra.json',
+        make_javascript_deterministic=False,
+        file_path=os.path.abspath(__file__))
+    for url in ('http://www.scirra.com/labs/renderperf3/',
+                'http://www.scirra.com/demos/c2/renderperfgl/',
+                'http://www.scirra.com/demos/c2/renderperf2d/'):
+      ps.AddPageWithDefaultRunNavigate(url)
+    return ps
+
+