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

tools/perf/benchmarks/robohornet_pro.py

 # Copyright (c) 2012 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.
 
 """Runs Microsoft's RoboHornet Pro benchmark."""
 
 import os
 
 from metrics import power
 from telemetry import test
@@ skipping 22 matching lines @@
     self._power_metric.AddResults(tab, results)
 
     result = int(tab.EvaluateJavaScript('stopTime - startTime'))
     results.Add('Total', 'ms', result)
 
 
 class RobohornetPro(test.Test):
   test = _RobohornetProMeasurement
 
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/robohornet_pro.json',
-        # Measurement require use of real Date.now() for measurement.
-        'make_javascript_deterministic': False,
-        'pages': [
-          { 'url':
-            'http://ie.microsoft.com/testdrive/performance/robohornetpro/' }
-          ]
-        }, os.path.abspath(__file__))
+    ps = page_set.PageSet(
+      archive_data_file='../page_sets/data/robohornet_pro.json',
+      # Measurement require use of real Date.now() for measurement.
+      make_javascript_deterministic=False,
+      file_path=os.path.abspath(__file__))
+    ps.AddPageWithDefaultRunNavigate(
+      'http://ie.microsoft.com/testdrive/performance/robohornetpro/')
+    return ps