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

tools/perf/benchmarks/dromaeo.py

 # Copyright (c) 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.
 
 import os
 
 from metrics import power
 from telemetry import test
 from telemetry.core import util
 from telemetry.page import page_measurement
@@ skipping 42 matching lines @@
 
   def CreatePageSet(self, options):
     """Makes a PageSet for Dromaeo benchmarks."""
     # Subclasses are expected to define a class member called query_param.
     if not hasattr(self, 'query_param'):
       raise NotImplementedError('query_param not in Dromaeo benchmark.')
     url = 'file://index.html?%s&automated' % self.query_param
     # The docstring of benchmark classes may also be used as a description
     # when 'run_benchmarks list' is run.
     description = self.__doc__ or 'Dromaeo JavaScript Benchmark'
-    page_set_dict = {
-        'description': description,
-        'pages': [{'url': url}],
-    }
     dromaeo_dir = os.path.join(util.GetChromiumSrcDir(),
                                'chrome', 'test', 'data', 'dromaeo')
-    return page_set.PageSet.FromDict(page_set_dict, dromaeo_dir)
+    ps = page_set.PageSet(description=description,
+                          file_path=dromaeo_dir)
+    ps.AddPageWithDefaultRunNavigate(url)
+    return ps
 
 
 class DromaeoDomCoreAttr(_DromaeoBenchmark):
   """Dromaeo DOMCore attr JavaScript benchmark."""
   tag = 'domcoreattr'
   query_param = 'dom-attr'
 
 
 class DromaeoDomCoreModify(_DromaeoBenchmark):
   """Dromaeo DOMCore modify JavaScript benchmark."""
@@ skipping 65 matching lines @@
   """Dromaeo JSLib traverse jquery JavaScript benchmark"""
   tag = 'jslibtraversejquery'
   query_param = 'jslib-traverse-jquery'
 
 
 class DromaeoJslibTraversePrototype(_DromaeoBenchmark):
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'