Move results related stuff to telemetry/results

BUG=

Review URL: https://codereview.chromium.org/327583002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276067 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 58 insertions, 45 deletions

diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py
index fcbbd53..c285395 100644
--- a/tools/perf/measurements/page_cycler_unittest.py
+++ b/tools/perf/measurements/page_cycler_unittest.py
@@ -5,8 +5,8 @@
 import unittest
 
 from telemetry.core import browser_options
-from telemetry.page import page_measurement_results
 from telemetry.page import page_runner
+from telemetry.results import page_measurement_results
 from telemetry.unittest import simple_mock
 
 from measurements import page_cycler
diff --git a/tools/perf/metrics/test_page_measurement_results.py b/tools/perf/metrics/test_page_measurement_results.py
index e1df8bd..6668e83 100644
--- a/tools/perf/metrics/test_page_measurement_results.py
+++ b/tools/perf/metrics/test_page_measurement_results.py
@@ -2,10 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from telemetry.page import page_measurement_results
 from telemetry.page import page as page_module
+from telemetry.results import page_measurement_results
 from telemetry.value import scalar
 
+
 class TestPageMeasurementResults(
     page_measurement_results.PageMeasurementResults):
   def __init__(self, test):
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
index 5df0d9a..f08ea56 100644
--- a/tools/telemetry/telemetry/page/page_runner.py
+++ b/tools/telemetry/telemetry/page/page_runner.py
@@ -23,9 +23,9 @@ from telemetry.page import cloud_storage
 from telemetry.page import page_filter
 from telemetry.page import page_runner_repeat
 from telemetry.page import page_test
-from telemetry.page import results_options
 from telemetry.page.actions import navigate
 from telemetry.page.actions import page_action
+from telemetry.results import results_options
 from telemetry.util import exception_formatter
 
 
diff --git a/tools/telemetry/telemetry/page/record_wpr.py b/tools/telemetry/telemetry/page/record_wpr.py
index 07ab64b..d805a2f 100755
--- a/tools/telemetry/telemetry/page/record_wpr.py
+++ b/tools/telemetry/telemetry/page/record_wpr.py
@@ -13,7 +13,6 @@ from telemetry.core import browser_options
 from telemetry.core import discover
 from telemetry.core import wpr_modes
 from telemetry.page import page_measurement
-from telemetry.page import page_measurement_results
 from telemetry.page import page_runner
 from telemetry.page import page_set
 from telemetry.page import page_test
@@ -21,6 +20,7 @@ from telemetry.page import profile_creator
 from telemetry.page import test_expectations
 from telemetry.page.actions import action_runner as action_runner_module
 from telemetry.page.actions import interact
+from telemetry.results import page_measurement_results
 
 
 class RecordPage(page_test.PageTest):  # pylint: disable=W0223
diff --git a/tools/telemetry/telemetry/page/perf_tests_helper.py b/tools/telemetry/telemetry/perf_tests_helper.py
index 9c24287..168bddc 100644
--- a/tools/telemetry/telemetry/page/perf_tests_helper.py
+++ b/tools/telemetry/telemetry/perf_tests_helper.py
@@ -1,4 +1,4 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 __future__ import absolute_import
diff --git a/tools/telemetry/telemetry/results/__init__.py b/tools/telemetry/telemetry/results/__init__.py
new file mode 100644
index 0000000..172bd9e
--- /dev/null
+++ b/tools/telemetry/telemetry/results/__init__.py
@@ -0,0 +1,8 @@
+# Copyright 2014 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.
+"""
+The PageTestResults hierarchy provides a way of representing the results of
+running the test or measurement on pages.
+"""
+
diff --git a/tools/telemetry/telemetry/page/block_page_measurement_results.py b/tools/telemetry/telemetry/results/block_page_measurement_results.py
index f1f865f..7780ab3 100644
--- a/tools/telemetry/telemetry/page/block_page_measurement_results.py
+++ b/tools/telemetry/telemetry/results/block_page_measurement_results.py
@@ -1,9 +1,9 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 os
 
-from telemetry.page import page_measurement_results
+from telemetry.results import page_measurement_results
 
 class BlockPageMeasurementResults(
     page_measurement_results.PageMeasurementResults):
diff --git a/tools/telemetry/telemetry/page/block_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/block_page_measurement_results_unittest.py
index 0536dd0..2ebc417 100644
--- a/tools/telemetry/telemetry/page/block_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/block_page_measurement_results_unittest.py
@@ -1,12 +1,13 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 StringIO
 import os
 import unittest
 
-from telemetry.page import block_page_measurement_results
 from telemetry.page import page_set
+from telemetry.results import block_page_measurement_results
+
 
 BlockPageMeasurementResults = \
     block_page_measurement_results.BlockPageMeasurementResults
diff --git a/tools/telemetry/telemetry/page/buildbot_page_measurement_results.py b/tools/telemetry/telemetry/results/buildbot_page_measurement_results.py
index f960f6a..e3e1944 100644
--- a/tools/telemetry/telemetry/page/buildbot_page_measurement_results.py
+++ b/tools/telemetry/telemetry/results/buildbot_page_measurement_results.py
@@ -1,11 +1,11 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 telemetry import perf_tests_helper
 from telemetry import value as value_module
-from telemetry.page import page_measurement_results
-from telemetry.page import perf_tests_helper
 from telemetry.value import summary as summary_module
+from telemetry.results import page_measurement_results
 
 
 class BuildbotPageMeasurementResults(
diff --git a/tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
index e5feb81..8b41a93 100644
--- a/tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
@@ -1,14 +1,14 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 os
 import unittest
 
-from telemetry.page import buildbot_page_measurement_results
+from telemetry import perf_tests_helper
 from telemetry.page import page_set
-from telemetry.page import perf_tests_helper
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
+from telemetry.results import buildbot_page_measurement_results
 
 def _MakePageSet():
   ps = page_set.PageSet(file_path=os.path.dirname(__file__))
diff --git a/tools/telemetry/telemetry/page/csv_page_measurement_results.py b/tools/telemetry/telemetry/results/csv_page_measurement_results.py
index 56eac05..0f9872f 100644
--- a/tools/telemetry/telemetry/page/csv_page_measurement_results.py
+++ b/tools/telemetry/telemetry/results/csv_page_measurement_results.py
@@ -1,11 +1,12 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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
 
-from telemetry.page import page_measurement_results
+from telemetry.results import page_measurement_results
 from telemetry.value import merge_values
 
+
 class CsvPageMeasurementResults(
     page_measurement_results.PageMeasurementResults):
   def __init__(self, output_stream, output_after_every_page=None):
diff --git a/tools/telemetry/telemetry/page/csv_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py
index 023eab4..2f645f5 100644
--- a/tools/telemetry/telemetry/page/csv_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py
@@ -1,4 +1,4 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 StringIO
@@ -6,9 +6,10 @@ import csv
 import os
 import unittest
 
-from telemetry.page import csv_page_measurement_results
+from telemetry.results import csv_page_measurement_results
 from telemetry.page import page_set
 
+
 def _MakePageSet():
   ps = page_set.PageSet(file_path=os.path.dirname(__file__))
   ps.AddPageWithDefaultRunNavigate('http://www.foo.com/')
diff --git a/tools/telemetry/telemetry/page/gtest_test_results.py b/tools/telemetry/telemetry/results/gtest_test_results.py
index 2bed684..2764ed9b 100644
--- a/tools/telemetry/telemetry/page/gtest_test_results.py
+++ b/tools/telemetry/telemetry/results/gtest_test_results.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
@@ -7,7 +7,8 @@ import sys
 import time
 import unittest
 
-from telemetry.page import page_test_results
+from telemetry.results import page_test_results
+
 
 class GTestTestResults(page_test_results.PageTestResults):
   def __init__(self, output_stream):
diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results.py b/tools/telemetry/telemetry/results/html_page_measurement_results.py
index cb2fc41..656657d 100644
--- a/tools/telemetry/telemetry/page/html_page_measurement_results.py
+++ b/tools/telemetry/telemetry/results/html_page_measurement_results.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
@@ -10,8 +10,8 @@ import re
 import sys
 
 from telemetry.core import util
-from telemetry.page import buildbot_page_measurement_results
 from telemetry.page import cloud_storage
+from telemetry.results import buildbot_page_measurement_results
 
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'util')
 import lastchange  # pylint: disable=F0401
diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py
index b7b8154..d05423c 100644
--- a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py
@@ -1,12 +1,12 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 os
 import StringIO
 import unittest
 
-from telemetry.page import html_page_measurement_results
 from telemetry.page import page_set
+from telemetry.results import html_page_measurement_results
 
 
 def _MakePageSet():
diff --git a/tools/telemetry/telemetry/page/page_measurement_results.py b/tools/telemetry/telemetry/results/page_measurement_results.py
index ee22b2f..0949e1d 100644
--- a/tools/telemetry/telemetry/page/page_measurement_results.py
+++ b/tools/telemetry/telemetry/results/page_measurement_results.py
@@ -1,9 +1,9 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 telemetry import value as value_module
-from telemetry.page import page_test_results
+from telemetry.results import page_test_results
 from telemetry.value import value_backcompat
 
 class PageMeasurementResults(page_test_results.PageTestResults):
diff --git a/tools/telemetry/telemetry/page/page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/page_measurement_results_unittest.py
index d30763e..edb46db 100644
--- a/tools/telemetry/telemetry/page/page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/page_measurement_results_unittest.py
@@ -1,12 +1,12 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 os
 import unittest
 
-from telemetry.page import page_measurement_results
+from telemetry import perf_tests_helper
 from telemetry.page import page_set
-from telemetry.page import perf_tests_helper
+from telemetry.results import page_measurement_results
 from telemetry.value import scalar
 
 def _MakePageSet():
diff --git a/tools/telemetry/telemetry/page/page_test_results.py b/tools/telemetry/telemetry/results/page_test_results.py
index dc653be..f9cb0f8 100644
--- a/tools/telemetry/telemetry/page/page_test_results.py
+++ b/tools/telemetry/telemetry/results/page_test_results.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
diff --git a/tools/telemetry/telemetry/page/page_test_results_unittest.py b/tools/telemetry/telemetry/results/page_test_results_unittest.py
index 01aed88..7ef5f9e 100644
--- a/tools/telemetry/telemetry/page/page_test_results_unittest.py
+++ b/tools/telemetry/telemetry/results/page_test_results_unittest.py
@@ -1,12 +1,12 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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 os
 import sys
 import unittest
 
-from telemetry.page import page_test_results
 from telemetry.page import page_set
+from telemetry.results import page_test_results
 
 class NonPrintingPageTestResults(
     page_test_results.PageTestResults):
diff --git a/tools/telemetry/telemetry/page/results_options.py b/tools/telemetry/telemetry/results/results_options.py
index 19dcd99..d64c4e6 100644
--- a/tools/telemetry/telemetry/page/results_options.py
+++ b/tools/telemetry/telemetry/results/results_options.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
@@ -7,13 +7,13 @@ import os
 import sys
 
 from telemetry.core import util
-from telemetry.page import block_page_measurement_results
-from telemetry.page import buildbot_page_measurement_results
-from telemetry.page import csv_page_measurement_results
-from telemetry.page import gtest_test_results
-from telemetry.page import html_page_measurement_results
 from telemetry.page import page_measurement
-from telemetry.page import page_measurement_results
+from telemetry.results import block_page_measurement_results
+from telemetry.results import buildbot_page_measurement_results
+from telemetry.results import csv_page_measurement_results
+from telemetry.results import gtest_test_results
+from telemetry.results import html_page_measurement_results
+from telemetry.results import page_measurement_results
 
 
 # Allowed output formats. The default is the first item in the list.
diff --git a/tools/telemetry/telemetry/test.py b/tools/telemetry/telemetry/test.py
index cee23f6..c89ba8ef 100644
--- a/tools/telemetry/telemetry/test.py
+++ b/tools/telemetry/telemetry/test.py
@@ -17,8 +17,8 @@ from telemetry.page import page_runner
 from telemetry.page import cloud_storage
 from telemetry.page import page_set
 from telemetry.page import page_test
-from telemetry.page import page_test_results
 from telemetry.page import test_expectations
+from telemetry.results import page_test_results
 
 
 Disabled = decorators.Disabled
diff --git a/tools/telemetry/telemetry/unittest/gtest_testrunner.py b/tools/telemetry/telemetry/unittest/gtest_testrunner.py
index 3319176..3694db0 100755
--- a/tools/telemetry/telemetry/unittest/gtest_testrunner.py
+++ b/tools/telemetry/telemetry/unittest/gtest_testrunner.py
@@ -13,7 +13,7 @@ import sys
 import time
 import unittest
 
-from telemetry.page import gtest_test_results
+from telemetry.results import gtest_test_results
 
 
 class GTestTestSuite(unittest.TestSuite):
diff --git a/tools/telemetry/telemetry/value/histogram.py b/tools/telemetry/telemetry/value/histogram.py
index 8bf95d21..8c4b0e7 100644
--- a/tools/telemetry/telemetry/value/histogram.py
+++ b/tools/telemetry/telemetry/value/histogram.py
@@ -4,7 +4,7 @@
 import json
 
 from telemetry import value as value_module
-from telemetry.page import perf_tests_helper
+from telemetry import perf_tests_helper
 
 class HistogramValueBucket(object):
   def __init__(self, low, high, count=0):
diff --git a/tools/telemetry/telemetry/web_perf/metrics/smoothness.py b/tools/telemetry/telemetry/web_perf/metrics/smoothness.py
index a815887..4e0bb50 100644
--- a/tools/telemetry/telemetry/web_perf/metrics/smoothness.py
+++ b/tools/telemetry/telemetry/web_perf/metrics/smoothness.py
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from telemetry.perf_tests_helper import FlattenList
 from telemetry.web_perf.metrics import timeline_based_metric
 from telemetry.web_perf.metrics import rendering_stats
-from telemetry.page.perf_tests_helper import FlattenList
 from telemetry.util import statistics
 
 
diff --git a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
index 63385c8..3ffc69a 100644
--- a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
+++ b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
@@ -9,12 +9,12 @@ from telemetry import test
 from telemetry.core import wpr_modes
 from telemetry.core.timeline import model as model_module
 from telemetry.core.timeline import async_slice
-from telemetry.page import page_measurement_results
 from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_set
 from telemetry.page import page as page_module
 # pylint: disable=W0401,W0614
 from telemetry.page.actions.all_page_actions import *
+from telemetry.results import page_measurement_results
 from telemetry.unittest import options_for_unittests
 from telemetry.web_perf import timeline_based_measurement as tbm_module
 from telemetry.web_perf.metrics import timeline_based_metric