Index: tools/telemetry/telemetry/page/record_wpr.py |
diff --git a/tools/telemetry/telemetry/record_wpr.py b/tools/telemetry/telemetry/page/record_wpr.py |
similarity index 87% |
rename from tools/telemetry/telemetry/record_wpr.py |
rename to tools/telemetry/telemetry/page/record_wpr.py |
index b6a552ff99d291135dc6dc1dc86cab43508bb330..495a82175041b4329f3e567a8ccb7171a1bb67a7 100755 |
--- a/tools/telemetry/telemetry/record_wpr.py |
+++ b/tools/telemetry/telemetry/page/record_wpr.py |
@@ -8,15 +8,15 @@ import sys |
import tempfile |
import time |
-from telemetry import all_page_actions # pylint: disable=W0611 |
-from telemetry import browser_finder |
-from telemetry import browser_options |
-from telemetry import discover |
-from telemetry import multi_page_benchmark |
-from telemetry import page_runner |
-from telemetry import page_set |
-from telemetry import page_test |
-from telemetry import wpr_modes |
+from telemetry.core import browser_finder |
+from telemetry.core import browser_options |
+from telemetry.core import wpr_modes |
+from telemetry.page import all_page_actions # pylint: disable=W0611 |
+from telemetry.page import multi_page_benchmark |
+from telemetry.page import page_runner |
+from telemetry.page import page_set |
+from telemetry.page import page_test |
+from telemetry.test import discover |
class RecordPage(page_test.PageTest): |
def __init__(self, benchmarks): |
@@ -62,7 +62,9 @@ class RecordPage(page_test.PageTest): |
def Main(benchmark_dir): |
- benchmarks = discover.Discover(benchmark_dir, '', |
+ benchmarks = discover.Discover(benchmark_dir, |
+ os.path.join(benchmark_dir, '..'), |
+ '', |
multi_page_benchmark.MultiPageBenchmark) |
options = browser_options.BrowserOptions() |
parser = options.CreateParser('%prog <page_set>') |