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

NOTRY=true

BUG=239179

Review URL: https://codereview.chromium.org/259623002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266889 0039d316-1c4b-4281-b951-d872f2087c98

tools/perf/benchmarks/dromaeo.py

@@ -60,13 +60,12 @@ class _DromaeoBenchmark(test.Test):
     # 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):

tools/perf/benchmarks/indexeddb_perf.py

@@ -89,8 +89,6 @@ class IndexedDb(test.Test):
   def CreatePageSet(self, options):
     indexeddb_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test',
                                  'data', 'indexeddb')
-    return page_set.PageSet.FromDict({
-        'pages': [
-            { 'url': 'file://perf_test.html' }
-          ]
-        }, indexeddb_dir)
+    ps = page_set.PageSet(file_path=indexeddb_dir)
+    ps.AddPageWithDefaultRunNavigate('file://perf_test.html')
+    return ps

tools/perf/benchmarks/jsgamebench.py

@@ -42,9 +42,8 @@ class Jsgamebench(test.Test):
   test = _JsgamebenchMeasurement
 
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/jsgamebench.json',
-        'pages': [
-          { 'url': 'http://localhost/' }
-          ]
-        }, os.path.dirname(__file__))
+    ps = page_set.PageSet(
+      archive_data_file='../page_sets/data/jsgamebench.json',
+      file_path=os.path.dirname(__file__))
+    ps.AddPageWithDefaultRunNavigate('http://localhost/')
+    return ps

tools/perf/benchmarks/kraken.py

@@ -54,9 +54,9 @@ class Kraken(test.Test):
   test = _KrakenMeasurement
 
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-        'archive_data_file': '../page_sets/data/kraken.json',
-        'pages': [
-          { 'url': 'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html' }
-          ]
-        }, os.path.abspath(__file__))
+    ps = page_set.PageSet(
+      archive_data_file='../page_sets/data/kraken.json',
+      file_path=os.path.abspath(__file__))
+    ps.AddPageWithDefaultRunNavigate(
+      'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html')
+    return ps

tools/perf/benchmarks/octane.py

@@ -80,12 +80,10 @@ class Octane(test.Test):
   test = _OctaneMeasurement
 
   def CreatePageSet(self, options):
-    return page_set.PageSet.FromDict({
-      'archive_data_file': '../page_sets/data/octane.json',
-      'make_javascript_deterministic': False,
-      'pages': [{
-          'url':
-          'http://octane-benchmark.googlecode.com/svn/latest/index.html?auto=1'
-          }
-        ]
-      }, os.path.abspath(__file__))
+    ps = page_set.PageSet(
+      archive_data_file='../page_sets/data/octane.json',
+      make_javascript_deterministic=False,
+      file_path=os.path.abspath(__file__))
+    ps.AddPageWithDefaultRunNavigate(
+      'http://octane-benchmark.googlecode.com/svn/latest/index.html?auto=1')
+    return ps

tools/perf/benchmarks/peacekeeper.py

@@ -14,8 +14,6 @@ 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
@@ -83,21 +81,16 @@ class PeaceKeeperBenchmark(test.Test):
     # 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):