[Telemetry] Reorganize everything.

tools/telemetry/telemetry/page/page_benchmark_results.py

 # 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.
 from collections import defaultdict
-from telemetry.page_test import PageTestResults
-from telemetry.perf_tests_helper import PrintPerfResult
-from telemetry.page_benchmark_value import PageBenchmarkValue
+
+from telemetry.page import page_test
+from telemetry.page import perf_tests_helper
+from telemetry.page import page_benchmark_value
 
 class ValuesForSinglePage(object):
   def __init__(self, page):
     self.page = page
     self.values = []
 
   def AddValue(self, value):
     self.values.append(value)
 
   @property
@@ skipping 15 matching lines @@
     return self.FindValueByTraceName(trace_name) != None
 
   def FindValueByTraceName(self, trace_name):
     values = [value for value in self.values
               if value.trace_name == trace_name]
     assert len(values) <= 1
     if len(values):
       return values[0]
     return None
 
-class PageBenchmarkResults(PageTestResults):
+class PageBenchmarkResults(page_test.PageTestResults):
   def __init__(self):
     super(PageBenchmarkResults, self).__init__()
     self._page_results = []
 
     self._all_measurements_that_have_been_seen = {}
 
     self._values_for_current_page = {}
 
   def __getitem__(self, i):
     """Shorthand for self.page_results[i]"""
@@ skipping 11 matching lines @@
     return self._page_results
 
   def WillMeasurePage(self, page):
     self._values_for_current_page = ValuesForSinglePage(page)
 
   @property
   def all_measurements_that_have_been_seen(self):
     return self._all_measurements_that_have_been_seen
 
   def Add(self, trace_name, units, value, chart_name=None, data_type='default'):
-    value = PageBenchmarkValue(trace_name, units, value, chart_name, data_type)
+    value = page_benchmark_value.PageBenchmarkValue(
+        trace_name, units, value, chart_name, data_type)
     measurement_name = value.measurement_name
 
     # Sanity checks.
     assert measurement_name != 'url', 'The name url cannot be used'
     if measurement_name in self._all_measurements_that_have_been_seen:
       measurement_data = \
           self._all_measurements_that_have_been_seen[measurement_name]
       last_seen_units = measurement_data['units']
       last_seen_data_type = measurement_data['type']
       assert last_seen_units == units, \
           'Unit cannot change for a name once it has been provided'
       assert last_seen_data_type == data_type, \
           'Unit cannot change for a name once it has been provided'
     else:
       self._all_measurements_that_have_been_seen[measurement_name] = {
         'units': units,
         'type': data_type}
 
     self._values_for_current_page.AddValue(value)
 
   def DidMeasurePage(self):
     assert self._values_for_current_page, 'Failed to call WillMeasurePage'
     self._page_results.append(self._values_for_current_page)
     self._values_for_current_page = None
 
   def _PrintPerfResult(self, measurement, trace, values, units,
                        result_type='default'):
-    PrintPerfResult(measurement, trace, values, units, result_type)
+    perf_tests_helper.PrintPerfResult(
+        measurement, trace, values, units, result_type)
 
   def PrintSummary(self, trace_tag):
     if self.page_failures:
       return
 
     # Build the results summary.
     results_summary = defaultdict(list)
     for measurement_name in \
           self._all_measurements_that_have_been_seen.iterkeys():
       for page_values in self._page_results:
@@ skipping 28 matching lines @@
 
       if not trace_tag:
         for value, url in value_url_list:
           self._PrintPerfResult(measurement + '_by_url', url, [value], units,
                                 by_url_data_type)
 
       # For histograms, we don't print the average data, only the _by_url.
       if not data_type == 'histogram':
         values = [i[0] for i in value_url_list]
         self._PrintPerfResult(measurement, trace, values, units, data_type)