Index: tools/perf/benchmarks/blink_perf.py |
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py |
index 9dee8658b670f6faf184f06b05cebda47cc60f57..7bba79961345e870bcb352fea6667f666e657f80 100644 |
--- a/tools/perf/benchmarks/blink_perf.py |
+++ b/tools/perf/benchmarks/blink_perf.py |
@@ -7,21 +7,9 @@ import os |
from telemetry import test |
from telemetry.core import util |
from telemetry.page import page_measurement |
-from telemetry.page import page as page_module |
from telemetry.page import page_set |
-class BlinkPerfPageSet(page_set.PageSet): |
- def __init__(self, file_path, page_urls, serving_dirs): |
- super(BlinkPerfPageSet, self).__init__(file_path=file_path, |
- serving_dirs=serving_dirs) |
- |
- for url in page_urls: |
- self.AddPage(page_module.PageWithDefaultRunNavigate( |
- url, page_set=self, base_dir=self._base_dir)) |
- self._InitializeArchive() |
- |
- |
def _CreatePageSetFromPath(path): |
assert os.path.exists(path) |
@@ -60,7 +48,10 @@ def _CreatePageSetFromPath(path): |
_AddDir(path, skipped) |
else: |
_AddPage(path) |
- return BlinkPerfPageSet(os.getcwd() + os.sep, page_urls, serving_dirs) |
+ ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs) |
+ for url in page_urls: |
+ ps.AddPageWithDefaultRunNavigate(url) |
+ return ps |
class _BlinkPerfMeasurement(page_measurement.PageMeasurement): |