[Telemetry] Reorganize everything.

tools/telemetry/telemetry/page/record_wpr.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 logging
 import os
 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):
     # This class overwrites PageTest.Run, so that the test method name is not
     # really used (except for throwing an exception if it doesn't exist).
     super(RecordPage, self).__init__('Run')
     self._action_names = set(
         [benchmark().action_name_to_run
          for benchmark in benchmarks.values()
          if benchmark().action_name_to_run])
@@ skipping 25 matching lines @@
     for action_name in self._action_names:
       if not hasattr(page, action_name):
         continue
       action_data = getattr(page, action_name)
       actions.append(all_page_actions.FindClassWithName(
           action_data['action'])(action_data))
     return actions
 
 
 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>')
   page_runner.PageRunner.AddCommandLineOptions(parser)
 
   recorder = RecordPage(benchmarks)
   recorder.AddCommandLineOptions(parser)
 
   _, args = parser.parse_args()
 
@@ skipping 32 matching lines @@
         [skipped['page'].url for skipped in results.skipped_pages]))
 
   if results.page_successes:
     # Update the metadata for the pages which were recorded.
     ps.wpr_archive_info.AddRecordedPages(
         [page['page'] for page in results.page_successes])
   else:
     os.remove(temp_target_wpr_file_path)
 
   return min(255, len(results.page_failures))