[Telemetry] Rename telemetry.unittest package to telemetry.unittest_util.

I encounter import naming conflict for |unittest| when trying to create
benchmark_unittest.py. It's possible to use absolute import to resolve it but I
believe unittest_util is a better naming anyway.

Note that there are some code in third_party/ and other
places that still references telemetry.unittest. This patch
gets around breaking those by adding telemetry/unittest.py
file that loads all modules in telemetry/unittest_util.py.

BUG=432228

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

Cr-Commit-Position: refs/heads/master@{#303932}

15 files changed, 31 insertions, 31 deletions

diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
index d8f757d..a382861 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -15,8 +15,8 @@ import unittest
 from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.page import page_test
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import progress_reporter
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import progress_reporter
 
 
 def SmokeTestGenerator(benchmark):
diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py
index f243773..22a4db7 100644
--- a/tools/perf/benchmarks/benchmark_unittest.py
+++ b/tools/perf/benchmarks/benchmark_unittest.py
@@ -10,7 +10,7 @@ import unittest
 from telemetry import benchmark as benchmark_module
 from telemetry.core import browser_options
 from telemetry.core import discover
-from telemetry.unittest import progress_reporter
+from telemetry.unittest_util import progress_reporter
 
 
 def _GetPerfDir(*subdirs):
diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py
index 7f32c92..6f5ee69 100644
--- a/tools/perf/measurements/page_cycler_unittest.py
+++ b/tools/perf/measurements/page_cycler_unittest.py
@@ -7,7 +7,7 @@ import unittest
 from telemetry.core import browser_options
 from telemetry.page import page_runner
 from telemetry.results import page_test_results
-from telemetry.unittest import simple_mock
+from telemetry.unittest_util import simple_mock
 
 from measurements import page_cycler
 
diff --git a/tools/perf/measurements/rasterize_and_record_micro_unittest.py b/tools/perf/measurements/rasterize_and_record_micro_unittest.py
index 3ac1d25..2abe61f 100644
--- a/tools/perf/measurements/rasterize_and_record_micro_unittest.py
+++ b/tools/perf/measurements/rasterize_and_record_micro_unittest.py
@@ -7,9 +7,9 @@ import logging
 from measurements import rasterize_and_record_micro
 from telemetry.core import wpr_modes
 from telemetry.page import page_test
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 
 class RasterizeAndRecordMicroUnitTest(page_test_test_case.PageTestTestCase):
diff --git a/tools/perf/measurements/record_per_area_unittest.py b/tools/perf/measurements/record_per_area_unittest.py
index d087bf2..d544cab 100644
--- a/tools/perf/measurements/record_per_area_unittest.py
+++ b/tools/perf/measurements/record_per_area_unittest.py
@@ -4,9 +4,9 @@
 
 from measurements import record_per_area
 from telemetry.core import wpr_modes
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 
 class RecordPerAreaUnitTest(page_test_test_case.PageTestTestCase):
diff --git a/tools/perf/measurements/repaint_unittest.py b/tools/perf/measurements/repaint_unittest.py
index 893c5be..7cbd18c 100644
--- a/tools/perf/measurements/repaint_unittest.py
+++ b/tools/perf/measurements/repaint_unittest.py
@@ -5,9 +5,9 @@
 from measurements import repaint
 from telemetry.core import wpr_modes
 from telemetry.page import page as page_module
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 
 class TestRepaintPage(page_module.Page):
diff --git a/tools/perf/measurements/screenshot_unittest.py b/tools/perf/measurements/screenshot_unittest.py
index 3e9b3b4..379adbc 100644
--- a/tools/perf/measurements/screenshot_unittest.py
+++ b/tools/perf/measurements/screenshot_unittest.py
@@ -8,8 +8,8 @@ import tempfile
 
 from measurements import screenshot
 from telemetry import benchmark
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
 
 
 class ScreenshotUnitTest(page_test_test_case.PageTestTestCase):
diff --git a/tools/perf/measurements/skpicture_printer_unittest.py b/tools/perf/measurements/skpicture_printer_unittest.py
index 1a115e2..1e6338b 100644
--- a/tools/perf/measurements/skpicture_printer_unittest.py
+++ b/tools/perf/measurements/skpicture_printer_unittest.py
@@ -6,9 +6,9 @@ import shutil
 import tempfile
 
 from measurements import skpicture_printer
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 
 class SkpicturePrinterUnitTest(page_test_test_case.PageTestTestCase):
diff --git a/tools/perf/measurements/smooth_gesture_util_unittest.py b/tools/perf/measurements/smooth_gesture_util_unittest.py
index 7fa2b72..cde44f4 100644
--- a/tools/perf/measurements/smooth_gesture_util_unittest.py
+++ b/tools/perf/measurements/smooth_gesture_util_unittest.py
@@ -11,7 +11,7 @@ from telemetry.page import page as page_module
 from telemetry.page import page_test
 from telemetry.timeline import async_slice
 from telemetry.timeline import model as model_module
-from telemetry.unittest import page_test_test_case
+from telemetry.unittest_util import page_test_test_case
 from telemetry.web_perf import timeline_interaction_record as tir_module
 
 
diff --git a/tools/perf/measurements/smoothness_unittest.py b/tools/perf/measurements/smoothness_unittest.py
index b82d1ab..b29406c 100644
--- a/tools/perf/measurements/smoothness_unittest.py
+++ b/tools/perf/measurements/smoothness_unittest.py
@@ -9,9 +9,9 @@ from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.page import page
 from telemetry.page import page_test
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 class FakeTracingController(object):
   def __init__(self):
diff --git a/tools/perf/measurements/task_execution_time_unittest.py b/tools/perf/measurements/task_execution_time_unittest.py
index 405cf44..5e35357 100644
--- a/tools/perf/measurements/task_execution_time_unittest.py
+++ b/tools/perf/measurements/task_execution_time_unittest.py
@@ -5,8 +5,8 @@
 from measurements import task_execution_time
 from telemetry.core import wpr_modes
 from telemetry.page import page as page_module
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
 
 
 class TestTaskExecutionTimePage(page_module.Page):
diff --git a/tools/perf/measurements/thread_times_unittest.py b/tools/perf/measurements/thread_times_unittest.py
index 01c56a5..ef54483 100644
--- a/tools/perf/measurements/thread_times_unittest.py
+++ b/tools/perf/measurements/thread_times_unittest.py
@@ -6,9 +6,9 @@ from measurements import thread_times
 from measurements import smoothness_unittest
 from metrics import timeline
 from telemetry.core import wpr_modes
-from telemetry.unittest import options_for_unittests
-from telemetry.unittest import page_test_test_case
-from telemetry.unittest import test
+from telemetry.unittest_util import options_for_unittests
+from telemetry.unittest_util import page_test_test_case
+from telemetry.unittest_util import test
 
 
 
diff --git a/tools/perf/metrics/webrtc_stats_unittest.py b/tools/perf/metrics/webrtc_stats_unittest.py
index 9b5c2bb..066f105 100644
--- a/tools/perf/metrics/webrtc_stats_unittest.py
+++ b/tools/perf/metrics/webrtc_stats_unittest.py
@@ -5,7 +5,7 @@
 import unittest
 
 from metrics import webrtc_stats
-from telemetry.unittest import simple_mock
+from telemetry.unittest_util import simple_mock
 
 
 SAMPLE_JSON = '''
diff --git a/tools/perf/page_sets/page_set_unittest.py b/tools/perf/page_sets/page_set_unittest.py
index d5dfd3f..af24525 100644
--- a/tools/perf/page_sets/page_set_unittest.py
+++ b/tools/perf/page_sets/page_set_unittest.py
@@ -5,7 +5,7 @@
 import os
 
 from telemetry import decorators
-from telemetry.unittest import page_set_smoke_test
+from telemetry.unittest_util import page_set_smoke_test
 
 
 class PageSetUnitTest(page_set_smoke_test.PageSetSmokeTest):
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 6497020..0f1f2dd 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -13,8 +13,8 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
 
-from telemetry.unittest import gtest_progress_reporter
-from telemetry.unittest import run_tests
+from telemetry.unittest_util import gtest_progress_reporter
+from telemetry.unittest_util import run_tests
 
 
 if __name__ == '__main__':