Remove FromDict from dorameo, indexeddb_perf, jsgamebench, kraken, octane, peacekeeper

tools/perf/benchmarks/peacekeeper.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.
 
 """PeaceKeeper benchmark suite.
 
 Peacekeeper measures browser's performance by testing its JavaScript
 functionality. JavaScript is a widely used programming language used in the
 creation of modern websites to provide features such as animation, navigation,
 forms and other common requirements. By measuring a browser's ability to handle
 commonly used JavaScript functions Peacekeeper can evaluate its performance.
 Peacekeeper scores are measured in operations per second or rendered frames per
 second depending on the test. Final Score is computed by calculating geometric
 mean of individual tests scores.
 """
 
-import os
-
 from telemetry import test
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 from telemetry.util import statistics
 from telemetry.value import merge_values
 from telemetry.value import scalar
 
 class _PeaceKeeperMeasurement(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
@@ skipping 47 matching lines @@
 
   def CreatePageSet(self, options):
     """Makes a PageSet for PeaceKeeper benchmarks."""
     # Subclasses are expected to define a class member called query_param.
     if not hasattr(self, 'test_param'):
       raise NotImplementedError('test_param not in PeaceKeeper benchmark.')
 
     # The docstring of benchmark classes may also be used as a description
     # when 'run_benchmarks list' is run.
     description = self.__doc__ or 'PeaceKeeper Benchmark'
-    test_urls = []
+    ps = page_set.PageSet(
+      description=description,
+      archive_data_file='../page_sets/data/peacekeeper_%s.json' % self.tag,
+      make_javascript_deterministic=False)
     for test_name in self.test_param:
-      test_urls.append(
-        {"url": ("http://peacekeeper.futuremark.com/run.action?debug=true&"
-                 "repeat=false&forceSuiteName=%s&forceTestName=%s") %
-                 (self.tag, test_name)
-        })
-
-    page_set_dict = {
-        'description': description,
-        'archive_data_file': '../page_sets/data/peacekeeper_%s.json' % self.tag,
-        'make_javascript_deterministic': False,
-        'pages': test_urls,
-    }
-    return page_set.PageSet.FromDict(page_set_dict, os.path.abspath(__file__))
+      ps.AddPageWithDefaultRunNavigate(
+        ('http://peacekeeper.futuremark.com/run.action?debug=true&'
+         'repeat=false&forceSuiteName=%s&forceTestName=%s') %
+        (self.tag, test_name))
+    return ps
 
 
 class PeaceKeeperRender(PeaceKeeperBenchmark):
   """PeaceKeeper rendering benchmark suite.
 
   These tests measure your browser's ability to render and modify specific
   elements used in typical web pages. Rendering tests manipulate the DOM tree in
   real-time. The tests measure display updating speed (frames per seconds).
   """
   tag = 'render'
@@ skipping 139 matching lines @@
   tag = 'html5'
   test_param = ['webglSphere',
                 'gamingSpitfire',
                 'videoCodecH264',
                 'videoCodecTheora',
                 'videoCodecWebM',
                 'videoPosterSupport',
                 'workerContrast01',
                 'workerContrast02'
                 ]