[Telemetry] Reorganize everything.

tools/telemetry/telemetry/page/multi_page_benchmark_runner.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 csv
 import logging
 import os
 import sys
 
-from telemetry import all_page_actions # pylint: disable=W0611
-from telemetry import block_page_benchmark_results
-from telemetry import browser_finder
-from telemetry import browser_options
-from telemetry import csv_page_benchmark_results
-from telemetry import discover
-from telemetry import multi_page_benchmark
-from telemetry import page_runner
-from telemetry import page_set
+from telemetry.core import browser_finder
+from telemetry.core import browser_options
+from telemetry.page import all_page_actions # pylint: disable=W0611
+from telemetry.page import block_page_benchmark_results
+from telemetry.page import csv_page_benchmark_results
+from telemetry.page import multi_page_benchmark
+from telemetry.page import page_runner
+from telemetry.page import page_set
+from telemetry.test import discover
 
 def Main(benchmark_dir):
   """Turns a MultiPageBenchmark into a command-line program.
 
   Args:
     benchmark_dir: Path to directory containing MultiPageBenchmarks.
   """
-  benchmarks = discover.Discover(benchmark_dir, '',
+  benchmarks = discover.Discover(benchmark_dir,
+                                 os.path.join(benchmark_dir, '..'),
+                                 '',
                                  multi_page_benchmark.MultiPageBenchmark)
 
   # Naively find the benchmark. If we use the browser options parser, we run
   # the risk of failing to parse if we use a benchmark-specific parameter.
   benchmark_name = None
   for arg in sys.argv:
     if arg in benchmarks:
       benchmark_name = arg
 
   options = browser_options.BrowserOptions()
@@ skipping 61 matching lines @@
   results.PrintSummary(options.browser_executable and '_ref' or '')
 
   if len(results.page_failures):
     logging.warning('Failed pages: %s', '\n'.join(
         [failure['page'].url for failure in results.page_failures]))
 
   if len(results.skipped_pages):
     logging.warning('Skipped pages: %s', '\n'.join(
         [skipped['page'].url for skipped in results.skipped_pages]))
   return min(255, len(results.page_failures))