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

tools/perf/benchmarks/scirra.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Scirra WebGL and Canvas2D rendering benchmark suite.
 
 The Scirra WebGL performance test measures the number of 2D triangles
 represented onscreen when the animation reaches the 30 FPS threshold.
 """
 
@@ skipping 36 matching lines @@
         """ % {'tickcount': tickcount, 'fps': fps, 'object_count': object_count}
     tab.WaitForJavaScriptExpression(js_is_done, 300)
     total = int(tab.EvaluateJavaScript('window.sprites'))
     results.Add('Count', 'count', total)
 
 
 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
 
+
+