diff options
-rwxr-xr-x | components/cronet/android/test/javaperftests/run.py | 2 | ||||
-rw-r--r-- | tools/chrome_proxy/common/network_metrics.py | 2 | ||||
-rw-r--r-- | tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py | 24 | ||||
-rw-r--r-- | tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py | 1 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/android_app_unittest.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/android_process.py | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/browser.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/browser_credentials.py | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/browser_finder.py | 12 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/extension_to_load.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/forwarders/android_forwarder.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/android_device.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/android_platform.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/android_platform_backend.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/__init__.py (renamed from tools/telemetry/telemetry/core/backends/__init__.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/adb_commands.py (renamed from tools/telemetry/telemetry/core/backends/adb_commands.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/android_app_backend.py (renamed from tools/telemetry/telemetry/core/backends/android_app_backend.py) | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py (renamed from tools/telemetry/telemetry/core/backends/android_browser_backend_settings.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/android_command_line_backend.py (renamed from tools/telemetry/telemetry/core/backends/android_command_line_backend.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/app_backend.py (renamed from tools/telemetry/telemetry/core/backends/app_backend.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/browser_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/__init__.py (renamed from tools/telemetry/telemetry/core/backends/chrome/__init__.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py) | 8 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py (renamed from tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py) | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py) | 10 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.html (renamed from tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.html) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.js (renamed from tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.js) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/manifest.json (renamed from tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/manifest.json) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_browser_with_oobe.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_test_case.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/crx_id.py (renamed from tools/telemetry/telemetry/core/backends/chrome/crx_id.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/crx_id_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/crx_id_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py (renamed from tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/extension_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/extension_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/ios_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/ios_browser_backend.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py (renamed from tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/misc_web_contents_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/oobe.py (renamed from tools/telemetry/telemetry/core/backends/chrome/oobe.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/system_info_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome/tab_list_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome/tab_list_backend_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/__init__.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/__init__.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py) | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py) | 16 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend_list.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime_unittest.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket_unittest.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend.py) | 4 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py) | 8 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/websocket.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket_unittest.py (renamed from tools/telemetry/telemetry/core/backends/chrome_inspector/websocket_unittest.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/codepen_credentials_backend.py (renamed from tools/telemetry/telemetry/core/backends/codepen_credentials_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/codepen_credentials_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/codepen_credentials_backend_unittest.py) | 5 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/facebook_credentials_backend.py (renamed from tools/telemetry/telemetry/core/backends/facebook_credentials_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/facebook_credentials_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/facebook_credentials_backend_unittest.py) | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/form_based_credentials_backend.py (renamed from tools/telemetry/telemetry/core/backends/form_based_credentials_backend.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py (renamed from tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/google_credentials_backend.py (renamed from tools/telemetry/telemetry/core/backends/google_credentials_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/google_credentials_backend_unittest.py (renamed from tools/telemetry/telemetry/core/backends/google_credentials_backend_unittest.py) | 5 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/mandoline/__init__.py (renamed from tools/telemetry/telemetry/core/backends/mandoline/__init__.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_backend.py (renamed from tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_backend.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py (renamed from tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_finder.py) | 2 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/mandoline/mandoline_browser_backend.py (renamed from tools/telemetry/telemetry/core/backends/mandoline/mandoline_browser_backend.py) | 6 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/remote/__init__.py (renamed from tools/telemetry/telemetry/core/backends/remote/__init__.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder.py (renamed from tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py) | 0 | ||||
-rw-r--r-- | tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py (renamed from tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder_unittest.py) | 2 |
95 files changed, 116 insertions, 123 deletions
diff --git a/components/cronet/android/test/javaperftests/run.py b/components/cronet/android/test/javaperftests/run.py index 191166f..c876588 100755 --- a/components/cronet/android/test/javaperftests/run.py +++ b/components/cronet/android/test/javaperftests/run.py @@ -54,7 +54,7 @@ from telemetry import benchmark from telemetry import benchmark_runner from telemetry import story from telemetry.core import forwarders -from telemetry.core.backends import adb_commands +from telemetry.internal.backends import adb_commands from telemetry.core.forwarders import android_forwarder from telemetry.value import scalar from telemetry.web_perf import timeline_based_measurement diff --git a/tools/chrome_proxy/common/network_metrics.py b/tools/chrome_proxy/common/network_metrics.py index 1af1260..0d571b8 100644 --- a/tools/chrome_proxy/common/network_metrics.py +++ b/tools/chrome_proxy/common/network_metrics.py @@ -12,7 +12,7 @@ import zlib from metrics import Metric from telemetry.page import page_test # All network metrics are Chrome only for now. -from telemetry.core.backends.chrome_inspector import inspector_network +from telemetry.internal.backends.chrome_inspector import inspector_network from telemetry.value import scalar diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py index e1d49c8..75dfd78 100644 --- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py @@ -3,20 +3,12 @@ # found in the LICENSE file. from common.chrome_proxy_benchmark import ChromeProxyBenchmark -from integration_tests import chrome_proxy_pagesets as pagesets from integration_tests import chrome_proxy_measurements as measurements +from integration_tests import chrome_proxy_pagesets as pagesets from telemetry import benchmark -from telemetry.core.backends.chrome import android_browser_finder -from telemetry.core.backends.chrome import cros_browser_finder -from telemetry.core.backends.chrome import desktop_browser_finder - - -ANDROID_CHROME_BROWSERS = [ - browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES - if 'webview' not in browser] -DESKTOP_CHROME_BROWSERS = (desktop_browser_finder.FindAllBrowserTypes(None) + - cros_browser_finder.FindAllBrowserTypes(None)) +NON_SAFE_BROWSING_BROWSERS = ['desktop', 'android-webview', + 'android-webview-shell'] class ChromeProxyClientVersion(ChromeProxyBenchmark): tag = 'client_version' @@ -98,7 +90,7 @@ class ChromeProxyBlockOnce(ChromeProxyBenchmark): return 'chrome_proxy_benchmark.block_once.block_once' -@benchmark.Enabled(*ANDROID_CHROME_BROWSERS) +@benchmark.Disabled(*NON_SAFE_BROWSING_BROWSERS) # Safebrowsing is enabled for Android and iOS. class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark): tag = 'safebrowsing_on' @@ -115,7 +107,7 @@ class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark): return 'chrome_proxy_benchmark.safebrowsing_on.safebrowsing' -@benchmark.Disabled(*ANDROID_CHROME_BROWSERS) +@benchmark.Enabled(*NON_SAFE_BROWSING_BROWSERS) # Safebrowsing is switched off for Android Webview and all desktop platforms. class ChromeProxySafeBrowsingOff(ChromeProxyBenchmark): tag = 'safebrowsing_off' @@ -188,7 +180,7 @@ class ChromeProxyClientConfig(ChromeProxyBenchmark): return 'chrome_proxy_benchmark.client_config.synthetic' -@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) +@benchmark.Enabled(desktop) class ChromeProxyVideoDirect(benchmark.Benchmark): tag = 'video' test = measurements.ChromeProxyVideoValidation @@ -199,7 +191,7 @@ class ChromeProxyVideoDirect(benchmark.Benchmark): return 'chrome_proxy_benchmark.video.direct' -@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) +@benchmark.Enabled(desktop) class ChromeProxyVideoProxied(benchmark.Benchmark): tag = 'video' test = measurements.ChromeProxyVideoValidation @@ -210,7 +202,7 @@ class ChromeProxyVideoProxied(benchmark.Benchmark): return 'chrome_proxy_benchmark.video.proxied' -@benchmark.Enabled(*DESKTOP_CHROME_BROWSERS) +@benchmark.Enabled(desktop) class ChromeProxyVideoCompare(benchmark.Benchmark): """Comparison of direct and proxied video fetches. diff --git a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py index 6ed90c9..7f4b707 100644 --- a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py +++ b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py @@ -5,7 +5,6 @@ from live_tests import chrome_proxy_measurements as measurements from live_tests import pagesets from telemetry import benchmark -from telemetry.core.backends.chrome import android_browser_finder class ChromeProxyLatency(benchmark.Benchmark): diff --git a/tools/telemetry/telemetry/core/android_app_unittest.py b/tools/telemetry/telemetry/core/android_app_unittest.py index fa38386..c65e861 100644 --- a/tools/telemetry/telemetry/core/android_app_unittest.py +++ b/tools/telemetry/telemetry/core/android_app_unittest.py @@ -7,10 +7,10 @@ import time import unittest from telemetry.core import android_app -from telemetry.core.backends import android_app_backend from telemetry.core import platform as platform_module from telemetry.core.platform import android_device from telemetry.core import util +from telemetry.internal.backends import android_app_backend from telemetry.unittest_util import options_for_unittests util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') diff --git a/tools/telemetry/telemetry/core/android_process.py b/tools/telemetry/telemetry/core/android_process.py index 62134c2..092f6cc 100644 --- a/tools/telemetry/telemetry/core/android_process.py +++ b/tools/telemetry/telemetry/core/android_process.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.core.backends import adb_commands -from telemetry.core.backends.chrome_inspector import devtools_client_backend from telemetry.core import web_contents +from telemetry.internal.backends import adb_commands +from telemetry.internal.backends.chrome_inspector import devtools_client_backend class WebViewNotFoundException(Exception): pass diff --git a/tools/telemetry/telemetry/core/browser.py b/tools/telemetry/telemetry/core/browser.py index a252482..aa10ede 100644 --- a/tools/telemetry/telemetry/core/browser.py +++ b/tools/telemetry/telemetry/core/browser.py @@ -5,7 +5,6 @@ import os from telemetry.core import app -from telemetry.core.backends import browser_backend from telemetry.core import browser_credentials from telemetry.core import exceptions from telemetry.core import extension_dict @@ -14,6 +13,7 @@ from telemetry.core import memory_cache_http_server from telemetry.core.platform import profiling_controller from telemetry.core import tab_list from telemetry import decorators +from telemetry.internal.backends import browser_backend class Browser(app.App): diff --git a/tools/telemetry/telemetry/core/browser_credentials.py b/tools/telemetry/telemetry/core/browser_credentials.py index 749d0ac..4d17edc 100644 --- a/tools/telemetry/telemetry/core/browser_credentials.py +++ b/tools/telemetry/telemetry/core/browser_credentials.py @@ -6,10 +6,10 @@ import json import logging import os -from telemetry.core.backends import codepen_credentials_backend -from telemetry.core.backends import facebook_credentials_backend -from telemetry.core.backends import google_credentials_backend from telemetry.core import util +from telemetry.internal.backends import codepen_credentials_backend +from telemetry.internal.backends import facebook_credentials_backend +from telemetry.internal.backends import google_credentials_backend from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/core/browser_finder.py index 902b843..b57dcfb 100644 --- a/tools/telemetry/telemetry/core/browser_finder.py +++ b/tools/telemetry/telemetry/core/browser_finder.py @@ -7,15 +7,15 @@ import logging import operator -from telemetry.core.backends.chrome import android_browser_finder -from telemetry.core.backends.chrome import cros_browser_finder -from telemetry.core.backends.chrome import desktop_browser_finder -from telemetry.core.backends.chrome import ios_browser_finder -from telemetry.core.backends.mandoline import desktop_mandoline_finder -from telemetry.core.backends.remote import trybot_browser_finder from telemetry.core import browser_finder_exceptions from telemetry.core import device_finder from telemetry import decorators +from telemetry.internal.backends.chrome import android_browser_finder +from telemetry.internal.backends.chrome import cros_browser_finder +from telemetry.internal.backends.chrome import desktop_browser_finder +from telemetry.internal.backends.chrome import ios_browser_finder +from telemetry.internal.backends.mandoline import desktop_mandoline_finder +from telemetry.internal.backends.remote import trybot_browser_finder BROWSER_FINDERS = [ desktop_browser_finder, diff --git a/tools/telemetry/telemetry/core/extension_to_load.py b/tools/telemetry/telemetry/core/extension_to_load.py index 20c8174..e40e375 100644 --- a/tools/telemetry/telemetry/core/extension_to_load.py +++ b/tools/telemetry/telemetry/core/extension_to_load.py @@ -3,7 +3,7 @@ # found in the LICENSE file. import os -from telemetry.core.backends.chrome import crx_id +from telemetry.internal.backends.chrome import crx_id class ExtensionPathNonExistentException(Exception): diff --git a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py index febcf19..9403fca 100644 --- a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py +++ b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py @@ -10,10 +10,10 @@ import struct import subprocess from catapult_base import support_binaries -from telemetry.core.backends import adb_commands from telemetry.core import forwarders from telemetry.core import platform from telemetry.core import util +from telemetry.internal.backends import adb_commands util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') try: diff --git a/tools/telemetry/telemetry/core/platform/android_device.py b/tools/telemetry/telemetry/core/platform/android_device.py index c7dc378..b573252 100644 --- a/tools/telemetry/telemetry/core/platform/android_device.py +++ b/tools/telemetry/telemetry/core/platform/android_device.py @@ -7,10 +7,10 @@ import re import subprocess import sys -from telemetry.core.backends import adb_commands from telemetry.core.platform import device from telemetry.core.platform.profiler import monsoon from telemetry.core import util +from telemetry.internal.backends import adb_commands class AndroidDevice(device.Device): diff --git a/tools/telemetry/telemetry/core/platform/android_platform.py b/tools/telemetry/telemetry/core/platform/android_platform.py index 55699e8..6ae17c7 100644 --- a/tools/telemetry/telemetry/core/platform/android_platform.py +++ b/tools/telemetry/telemetry/core/platform/android_platform.py @@ -4,9 +4,9 @@ from telemetry.core import android_app -from telemetry.core.backends import android_app_backend from telemetry.core import platform from telemetry.core.platform import android_action_runner +from telemetry.internal.backends import android_app_backend class AndroidPlatform(platform.Platform): diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py index 92bde5d..f09c8d7 100644 --- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py +++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py @@ -9,7 +9,6 @@ import shutil import subprocess import tempfile -from telemetry.core.backends import adb_commands from telemetry.core import exceptions from telemetry.core.forwarders import android_forwarder from telemetry.core import platform @@ -25,6 +24,7 @@ from telemetry.core.platform.profiler import android_prebuilt_profiler_helper from telemetry.core import util from telemetry.core import video from telemetry import decorators +from telemetry.internal.backends import adb_commands from telemetry.internal.util import exception_formatter from telemetry.internal.util import external_modules diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py index 5e3aad8..991bf11 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py @@ -5,9 +5,9 @@ import os import subprocess -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler from telemetry.core import util +from telemetry.internal.backends.chrome import android_browser_finder class AndroidScreenRecordingProfiler(profiler.Profiler): diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py index a2d0bc3..b58a269 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py @@ -7,10 +7,10 @@ import StringIO import subprocess import zipfile -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler from telemetry.core.platform import tracing_options from telemetry.core import util +from telemetry.internal.backends.chrome import android_browser_finder from telemetry.timeline import trace_data as trace_data_module _SYSTRACE_CATEGORIES = [ diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py index e10d9c1..b015227 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py @@ -5,9 +5,9 @@ import logging import os -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler from telemetry.core import util +from telemetry.internal.backends.chrome import android_browser_finder util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') try: diff --git a/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py index 3fd7ab7..3b5afe3 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py @@ -7,9 +7,9 @@ import os import subprocess import threading -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler from telemetry.core import util +from telemetry.internal.backends.chrome import android_browser_finder util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') try: diff --git a/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py index fe7a9ed..a536700 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py @@ -5,9 +5,9 @@ import os from catapult_base import support_binaries -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler from telemetry.core import util +from telemetry.internal.backends.chrome import android_browser_finder util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') from pylib.device import intent # pylint: disable=F0401 diff --git a/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py index 01d95c3..87ef10e 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py @@ -6,8 +6,8 @@ import logging import os import sys -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core.platform import profiler +from telemetry.internal.backends.chrome import android_browser_finder # Enviroment variables to (android properties, default value) mapping. _ENV_VARIABLES = { diff --git a/tools/telemetry/telemetry/core/backends/__init__.py b/tools/telemetry/telemetry/internal/backends/__init__.py index 9228df8..9228df8 100644 --- a/tools/telemetry/telemetry/core/backends/__init__.py +++ b/tools/telemetry/telemetry/internal/backends/__init__.py diff --git a/tools/telemetry/telemetry/core/backends/adb_commands.py b/tools/telemetry/telemetry/internal/backends/adb_commands.py index 230fabb..230fabb 100644 --- a/tools/telemetry/telemetry/core/backends/adb_commands.py +++ b/tools/telemetry/telemetry/internal/backends/adb_commands.py diff --git a/tools/telemetry/telemetry/core/backends/android_app_backend.py b/tools/telemetry/telemetry/internal/backends/android_app_backend.py index b2c56f2..af69d3a 100644 --- a/tools/telemetry/telemetry/core/backends/android_app_backend.py +++ b/tools/telemetry/telemetry/internal/backends/android_app_backend.py @@ -5,10 +5,10 @@ import re from telemetry.core import android_process -from telemetry.core.backends import android_browser_backend_settings -from telemetry.core.backends import android_command_line_backend -from telemetry.core.backends import app_backend from telemetry.core import util +from telemetry.internal.backends import android_browser_backend_settings +from telemetry.internal.backends import android_command_line_backend +from telemetry.internal.backends import app_backend class AndroidAppBackend(app_backend.AppBackend): diff --git a/tools/telemetry/telemetry/core/backends/android_browser_backend_settings.py b/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py index 21f4f1d..21f4f1d 100644 --- a/tools/telemetry/telemetry/core/backends/android_browser_backend_settings.py +++ b/tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend.py b/tools/telemetry/telemetry/internal/backends/android_command_line_backend.py index e05c0bb..e05c0bb 100644 --- a/tools/telemetry/telemetry/core/backends/android_command_line_backend.py +++ b/tools/telemetry/telemetry/internal/backends/android_command_line_backend.py diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py index da57d09..4ff050c 100644 --- a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/android_command_line_backend_unittest.py @@ -5,8 +5,8 @@ import unittest from telemetry import benchmark -from telemetry.core.backends import adb_commands -from telemetry.core.backends import android_command_line_backend +from telemetry.internal.backends import adb_commands +from telemetry.internal.backends import android_command_line_backend from telemetry.unittest_util import options_for_unittests class _MockBackendSettings(object): diff --git a/tools/telemetry/telemetry/core/backends/app_backend.py b/tools/telemetry/telemetry/internal/backends/app_backend.py index 6ad9812..6ad9812 100644 --- a/tools/telemetry/telemetry/core/backends/app_backend.py +++ b/tools/telemetry/telemetry/internal/backends/app_backend.py diff --git a/tools/telemetry/telemetry/core/backends/browser_backend.py b/tools/telemetry/telemetry/internal/backends/browser_backend.py index e28bbe4..c53ec83 100644 --- a/tools/telemetry/telemetry/core/backends/browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/browser_backend.py @@ -2,11 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends import app_backend from telemetry.core import platform from telemetry.core.platform import profiling_controller_backend from telemetry.core import web_contents from telemetry import decorators +from telemetry.internal.backends import app_backend class ExtensionsNotSupportedException(Exception): diff --git a/tools/telemetry/telemetry/core/backends/chrome/__init__.py b/tools/telemetry/telemetry/internal/backends/chrome/__init__.py index 9228df8..9228df8 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/__init__.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/__init__.py diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py index 1f914db..3cee5b6 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py @@ -5,15 +5,15 @@ import logging import sys -from telemetry.core.backends import adb_commands -from telemetry.core.backends import android_command_line_backend -from telemetry.core.backends import browser_backend -from telemetry.core.backends.chrome import chrome_browser_backend from telemetry.core import exceptions from telemetry.core import forwarders from telemetry.core.platform import android_platform_backend as \ android_platform_backend_module from telemetry.core import util +from telemetry.internal.backends import adb_commands +from telemetry.internal.backends import android_command_line_backend +from telemetry.internal.backends import browser_backend +from telemetry.internal.backends.chrome import chrome_browser_backend util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') from pylib.device import intent # pylint: disable=F0401 diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py index 7749265..d1eaf6b 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py @@ -7,9 +7,6 @@ import logging import os -from telemetry.core.backends import adb_commands -from telemetry.core.backends import android_browser_backend_settings -from telemetry.core.backends.chrome import android_browser_backend from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform @@ -17,6 +14,9 @@ from telemetry.core.platform import android_device from telemetry.core import possible_browser from telemetry.core import util from telemetry import decorators +from telemetry.internal.backends import adb_commands +from telemetry.internal.backends import android_browser_backend_settings +from telemetry.internal.backends.chrome import android_browser_backend CHROME_PACKAGE_NAMES = { diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py index ae6660f..a94d62c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder_unittest.py @@ -4,8 +4,8 @@ import unittest -from telemetry.core.backends.chrome import android_browser_finder from telemetry.core import browser_options +from telemetry.internal.backends.chrome import android_browser_finder from telemetry.unittest_util import system_stub diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py index c46fdd30..d4fc22e 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py @@ -7,11 +7,6 @@ import pprint import re import sys -from telemetry.core.backends import browser_backend -from telemetry.core.backends.chrome import extension_backend -from telemetry.core.backends.chrome import system_info_backend -from telemetry.core.backends.chrome import tab_list_backend -from telemetry.core.backends.chrome_inspector import devtools_client_backend from telemetry.core import exceptions from telemetry.core import forwarders from telemetry.core import user_agent @@ -19,6 +14,11 @@ from telemetry.core import util from telemetry.core import web_contents from telemetry.core import wpr_modes from telemetry import decorators +from telemetry.internal.backends import browser_backend +from telemetry.internal.backends.chrome import extension_backend +from telemetry.internal.backends.chrome import system_info_backend +from telemetry.internal.backends.chrome import tab_list_backend +from telemetry.internal.backends.chrome_inspector import devtools_client_backend from telemetry.unittest_util import options_for_unittests diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py index db633a7..71fc0a9 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py @@ -4,8 +4,8 @@ import unittest -from telemetry.core.backends.chrome import chrome_browser_backend from telemetry.core import wpr_modes +from telemetry.internal.backends.chrome import chrome_browser_backend class FakePlatformBackend(object): diff --git a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.html b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.html index 07a643c..07a643c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.html +++ b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.html diff --git a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.js b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.js index 7d21eb3..7d21eb3 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/main.js +++ b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/main.js diff --git a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/manifest.json b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/manifest.json index ec809c6..ec809c6 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chromeos_login_ext/manifest.json +++ b/tools/telemetry/telemetry/internal/backends/chrome/chromeos_login_ext/manifest.json diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py index 617f289..397ca04 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_backend.py @@ -5,12 +5,12 @@ import logging import os -from telemetry.core.backends.chrome import chrome_browser_backend -from telemetry.core.backends.chrome import misc_web_contents_backend from telemetry.core import exceptions from telemetry.core import forwarders from telemetry.core import util from telemetry import decorators +from telemetry.internal.backends.chrome import chrome_browser_backend +from telemetry.internal.backends.chrome import misc_web_contents_backend class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py index 044739b..62f4e47 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder.py @@ -6,14 +6,14 @@ import logging -from telemetry.core.backends.chrome import cros_browser_backend -from telemetry.core.backends.chrome import cros_browser_with_oobe from telemetry.core import browser from telemetry.core import browser_finder_exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import cros_device from telemetry.core.platform import cros_interface from telemetry.core import possible_browser +from telemetry.internal.backends.chrome import cros_browser_backend +from telemetry.internal.backends.chrome import cros_browser_with_oobe class PossibleCrOSBrowser(possible_browser.PossibleBrowser): diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder_unittest.py index d467819..d467819 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_finder_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_with_oobe.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py index 7d7dbbb..39f8fea 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_with_oobe.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_browser_with_oobe.py @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends.chrome import cros_browser_backend from telemetry.core import browser +from telemetry.internal.backends.chrome import cros_browser_backend class CrOSBrowserWithOOBE(browser.Browser): diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_test_case.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py index b2564c4..b2564c4 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_test_case.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_test_case.py diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py index 1943ce7..f4dc305 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/cros_unittest.py @@ -5,10 +5,10 @@ import logging import urllib2 -from telemetry.core.backends.chrome import cros_test_case from telemetry.core import exceptions from telemetry.core import util from telemetry import decorators +from telemetry.internal.backends.chrome import cros_test_case class CrOSCryptohomeTest(cros_test_case.CrOSTestCase): diff --git a/tools/telemetry/telemetry/core/backends/chrome/crx_id.py b/tools/telemetry/telemetry/internal/backends/chrome/crx_id.py index 21d17a2..21d17a2 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/crx_id.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/crx_id.py diff --git a/tools/telemetry/telemetry/core/backends/chrome/crx_id_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/crx_id_unittest.py index c544b35..9cea905 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/crx_id_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/crx_id_unittest.py @@ -6,8 +6,8 @@ import shutil import unittest import tempfile -from telemetry.core.backends.chrome import crx_id from telemetry.core import util +from telemetry.internal.backends.chrome import crx_id class CrxIdUnittest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py index 06307e7..14af883 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py @@ -16,10 +16,10 @@ import tempfile import time from catapult_base import support_binaries -from telemetry.core.backends import browser_backend -from telemetry.core.backends.chrome import chrome_browser_backend from telemetry.core import exceptions from telemetry.core import util +from telemetry.internal.backends import browser_backend +from telemetry.internal.backends.chrome import chrome_browser_backend from telemetry.internal.util import path diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py index 403b3e6..55802e8 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py @@ -8,12 +8,12 @@ import os import subprocess import sys -from telemetry.core.backends.chrome import desktop_browser_backend from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import desktop_device from telemetry.core import possible_browser +from telemetry.internal.backends.chrome import desktop_browser_backend from telemetry.internal.util import path diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py index b06ae70a..38f69f9 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder_unittest.py @@ -3,9 +3,9 @@ # found in the LICENSE file. import unittest -from telemetry.core.backends.chrome import desktop_browser_finder from telemetry.core import browser_options from telemetry.core.platform import desktop_device +from telemetry.internal.backends.chrome import desktop_browser_finder from telemetry.unittest_util import system_stub diff --git a/tools/telemetry/telemetry/core/backends/chrome/extension_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/extension_backend.py index f0f4e7e..c8f7dac 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/extension_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/extension_backend.py @@ -4,8 +4,8 @@ import collections -from telemetry.core.backends.chrome_inspector import inspector_backend_list from telemetry.core import extension_page +from telemetry.internal.backends.chrome_inspector import inspector_backend_list class ExtensionBackendList(inspector_backend_list.InspectorBackendList): diff --git a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_backend.py index ad65049..1c193f0 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_backend.py @@ -8,10 +8,10 @@ import logging import re import urllib2 -from telemetry.core.backends.chrome import chrome_browser_backend -from telemetry.core.backends.chrome import system_info_backend from telemetry.core import exceptions from telemetry.core import util +from telemetry.internal.backends.chrome import chrome_browser_backend +from telemetry.internal.backends.chrome import system_info_backend class IosBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): diff --git a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py index 3b2f109..ac4cc2f 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder.py @@ -7,13 +7,13 @@ import logging import re -from telemetry.core.backends.chrome import ios_browser_backend -from telemetry.core.backends.chrome_inspector import inspector_backend from telemetry.core import browser from telemetry.core import platform from telemetry.core.platform import ios_device from telemetry.core.platform import ios_platform_backend from telemetry.core import possible_browser +from telemetry.internal.backends.chrome import ios_browser_backend +from telemetry.internal.backends.chrome_inspector import inspector_backend # Key matches output from ios-webkit-debug-proxy and the value is a readable diff --git a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py index 0b05318..8f2e93f 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/ios_browser_finder_unittest.py @@ -3,10 +3,10 @@ # found in the LICENSE file. import unittest -from telemetry.core.backends.chrome import ios_browser_finder from telemetry.core import browser_options from telemetry.core.platform import ios_device from telemetry import decorators +from telemetry.internal.backends.chrome import ios_browser_finder class IosBrowserFinderUnitTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/misc_web_contents_backend.py index b430312..c2babbd 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/misc_web_contents_backend.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.core.backends.chrome import oobe -from telemetry.core.backends.chrome_inspector import inspector_backend_list from telemetry.core import exceptions +from telemetry.internal.backends.chrome import oobe +from telemetry.internal.backends.chrome_inspector import inspector_backend_list class MiscWebContentsBackend(inspector_backend_list.InspectorBackendList): diff --git a/tools/telemetry/telemetry/core/backends/chrome/oobe.py b/tools/telemetry/telemetry/internal/backends/chrome/oobe.py index 25a20eb..25a20eb 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/oobe.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/oobe.py diff --git a/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/system_info_backend.py index 2a4c856..bd15419 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/system_info_backend.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.core.backends.chrome_inspector import inspector_websocket from telemetry.core import camel_case from telemetry.core import system_info +from telemetry.internal.backends.chrome_inspector import inspector_websocket class SystemInfoBackend(object): diff --git a/tools/telemetry/telemetry/core/backends/chrome/tab_list_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend.py index bd89946..354d461 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/tab_list_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend.py @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends.chrome_inspector import inspector_backend_list from telemetry.core import exceptions from telemetry.core import tab from telemetry.core import util +from telemetry.internal.backends.chrome_inspector import inspector_backend_list class TabUnexpectedResponseException(exceptions.Error): diff --git a/tools/telemetry/telemetry/core/backends/chrome/tab_list_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py index 98a2dc8..98a2dc8 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/tab_list_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome/tab_list_backend_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/__init__.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/__init__.py index 83c375c..83c375c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/__init__.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/__init__.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py index 17d0800..fd907ea 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py @@ -6,12 +6,12 @@ import logging import re import sys -from telemetry.core.backends.chrome_inspector import devtools_http -from telemetry.core.backends.chrome_inspector import inspector_backend -from telemetry.core.backends.chrome_inspector import tracing_backend from telemetry.core import exceptions from telemetry.core.platform.tracing_agent import chrome_tracing_agent from telemetry import decorators +from telemetry.internal.backends.chrome_inspector import devtools_http +from telemetry.internal.backends.chrome_inspector import inspector_backend +from telemetry.internal.backends.chrome_inspector import tracing_backend from telemetry.timeline import trace_data as trace_data_module diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py index febe4ce..febe4ce 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http.py index fecd768..fecd768 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http_unittest.py index 092a462..ff397ff 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_http_unittest.py @@ -4,7 +4,7 @@ import unittest -from telemetry.core.backends.chrome_inspector import devtools_http +from telemetry.internal.backends.chrome_inspector import devtools_http class DevToolsHttpTest(unittest.TestCase): diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py index ab6e870..3aa050a 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py @@ -8,16 +8,16 @@ import os import socket import sys -from telemetry.core.backends.chrome_inspector import devtools_http -from telemetry.core.backends.chrome_inspector import inspector_console -from telemetry.core.backends.chrome_inspector import inspector_memory -from telemetry.core.backends.chrome_inspector import inspector_network -from telemetry.core.backends.chrome_inspector import inspector_page -from telemetry.core.backends.chrome_inspector import inspector_runtime -from telemetry.core.backends.chrome_inspector import inspector_websocket -from telemetry.core.backends.chrome_inspector import websocket from telemetry.core import exceptions from telemetry import decorators +from telemetry.internal.backends.chrome_inspector import devtools_http +from telemetry.internal.backends.chrome_inspector import inspector_console +from telemetry.internal.backends.chrome_inspector import inspector_memory +from telemetry.internal.backends.chrome_inspector import inspector_network +from telemetry.internal.backends.chrome_inspector import inspector_page +from telemetry.internal.backends.chrome_inspector import inspector_runtime +from telemetry.internal.backends.chrome_inspector import inspector_websocket +from telemetry.internal.backends.chrome_inspector import websocket from telemetry.timeline import model as timeline_model_module from telemetry.timeline import trace_data as trace_data_module diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend_list.py index 7e1f8fb..7e1f8fb 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend_list.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console.py index ebd8aef..ebd8aef 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py index 0bfe65c..0bfe65c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_console_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_console_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory.py index cd4ddf0..cd4ddf0 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py index 064ad3c..064ad3c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_memory_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_memory_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network.py index 5ec73ec..5ec73ec 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py index 920f27f..5242fc7 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_network_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_network_unittest.py @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends.chrome_inspector import inspector_network from telemetry import decorators +from telemetry.internal.backends.chrome_inspector import inspector_network from telemetry.unittest_util import tab_test_case diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page.py index 2c3b087..2c3b087 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py index 486e510..486e510 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_page_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime.py index c786447..c786447 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py index 001a02d..001a02d 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_runtime_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_runtime_unittest.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket.py index e63e23e..590ed21 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket.py @@ -5,8 +5,8 @@ import json import logging -from telemetry.core.backends.chrome_inspector import websocket from telemetry.core import exceptions +from telemetry.internal.backends.chrome_inspector import websocket class WebSocketDisconnected(exceptions.Error): """An attempt was made to use a web socket after it had been disconnected.""" diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py index f008196..a75a8ac 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket_unittest.py @@ -5,8 +5,8 @@ import unittest from telemetry import decorators -from telemetry.core.backends.chrome_inspector import inspector_websocket -from telemetry.core.backends.chrome_inspector import websocket +from telemetry.internal.backends.chrome_inspector import inspector_websocket +from telemetry.internal.backends.chrome_inspector import websocket from telemetry.unittest_util import simple_mock diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py index 33c1c1c..f176a5c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py @@ -6,10 +6,10 @@ import logging import socket import time -from telemetry.core.backends.chrome_inspector import inspector_websocket -from telemetry.core.backends.chrome_inspector import websocket from telemetry.core.platform import tracing_options from telemetry import decorators +from telemetry.internal.backends.chrome_inspector import inspector_websocket +from telemetry.internal.backends.chrome_inspector import websocket from telemetry.timeline import trace_data as trace_data_module diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py index 716b153..babb0ec 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py @@ -4,11 +4,11 @@ import unittest -from telemetry.core.backends.chrome_inspector import tracing_backend -from telemetry.core.backends.chrome_inspector import websocket from telemetry.core.platform import tracing_category_filter from telemetry.core.platform import tracing_options from telemetry.core import util +from telemetry.internal.backends.chrome_inspector import tracing_backend +from telemetry.internal.backends.chrome_inspector import websocket from telemetry.timeline import model as model_module from telemetry.unittest_util import simple_mock from telemetry.unittest_util import tab_test_case @@ -111,7 +111,7 @@ class TracingBackendUnitTest(unittest.TestCase): inspector.AddResponse('Tracing.dataCollected', 'asdf2', 19) inspector.AddResponse('Tracing.tracingComplete', 'asdf3', 35) - with mock.patch('telemetry.core.backends.chrome_inspector.' + with mock.patch('telemetry.internal.backends.chrome_inspector.' 'inspector_websocket.InspectorWebsocket') as mock_class: mock_class.return_value = inspector backend = tracing_backend.TracingBackend(devtools_port=65000) @@ -129,7 +129,7 @@ class TracingBackendUnitTest(unittest.TestCase): inspector.AddResponse('Tracing.dataCollected', 'asdf2', 14) inspector.AddResponse('Tracing.tracingComplete', 'asdf3', 19) - with mock.patch('telemetry.core.backends.chrome_inspector.' + with mock.patch('telemetry.internal.backends.chrome_inspector.' 'inspector_websocket.InspectorWebsocket') as mock_class: mock_class.return_value = inspector backend = tracing_backend.TracingBackend(devtools_port=65000) diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/websocket.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket.py index f8682fd..f8682fd 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/websocket.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket.py diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/websocket_unittest.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket_unittest.py index f1cc10f..426043e 100644 --- a/tools/telemetry/telemetry/core/backends/chrome_inspector/websocket_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/websocket_unittest.py @@ -9,7 +9,7 @@ import socket import threading import unittest -from telemetry.core.backends.chrome_inspector import websocket +from telemetry.internal.backends.chrome_inspector import websocket # Minimal handler for a local websocket server. diff --git a/tools/telemetry/telemetry/core/backends/codepen_credentials_backend.py b/tools/telemetry/telemetry/internal/backends/codepen_credentials_backend.py index a12ae4b..6cd1a57 100644 --- a/tools/telemetry/telemetry/core/backends/codepen_credentials_backend.py +++ b/tools/telemetry/telemetry/internal/backends/codepen_credentials_backend.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends import form_based_credentials_backend +from telemetry.internal.backends import form_based_credentials_backend class CodePenCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/codepen_credentials_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/codepen_credentials_backend_unittest.py index 7ec54d9a2..2dc8ce7 100644 --- a/tools/telemetry/telemetry/core/backends/codepen_credentials_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/codepen_credentials_backend_unittest.py @@ -1,8 +1,9 @@ # 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.core.backends import codepen_credentials_backend -from telemetry.core.backends import form_based_credentials_backend_unittest_base +from telemetry.internal.backends import codepen_credentials_backend +from telemetry.internal.backends \ + import form_based_credentials_backend_unittest_base class TestCodePenCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/facebook_credentials_backend.py b/tools/telemetry/telemetry/internal/backends/facebook_credentials_backend.py index a95c4cb..b1a25dc 100644 --- a/tools/telemetry/telemetry/core/backends/facebook_credentials_backend.py +++ b/tools/telemetry/telemetry/internal/backends/facebook_credentials_backend.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends import form_based_credentials_backend +from telemetry.internal.backends import form_based_credentials_backend class FacebookCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/facebook_credentials_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/facebook_credentials_backend_unittest.py index c182ce7..bbcd34a 100644 --- a/tools/telemetry/telemetry/core/backends/facebook_credentials_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/facebook_credentials_backend_unittest.py @@ -1,9 +1,9 @@ # Copyright 2013 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.core.backends import facebook_credentials_backend -from telemetry.core. \ - backends import form_based_credentials_backend_unittest_base +from telemetry.internal.backends import facebook_credentials_backend +from telemetry.internal.backends \ + import form_based_credentials_backend_unittest_base class TestFacebookCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend.py b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend.py index a569324..a569324 100644 --- a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend.py +++ b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend.py diff --git a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py index a2b3e2a..a2b3e2a 100644 --- a/tools/telemetry/telemetry/core/backends/form_based_credentials_backend_unittest_base.py +++ b/tools/telemetry/telemetry/internal/backends/form_based_credentials_backend_unittest_base.py diff --git a/tools/telemetry/telemetry/core/backends/google_credentials_backend.py b/tools/telemetry/telemetry/internal/backends/google_credentials_backend.py index 118dd25..135d627 100644 --- a/tools/telemetry/telemetry/core/backends/google_credentials_backend.py +++ b/tools/telemetry/telemetry/internal/backends/google_credentials_backend.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -from telemetry.core.backends import form_based_credentials_backend +from telemetry.internal.backends import form_based_credentials_backend class GoogleCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/google_credentials_backend_unittest.py b/tools/telemetry/telemetry/internal/backends/google_credentials_backend_unittest.py index e02ecb2..b30c051 100644 --- a/tools/telemetry/telemetry/core/backends/google_credentials_backend_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/google_credentials_backend_unittest.py @@ -1,8 +1,9 @@ # Copyright 2013 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.core.backends import form_based_credentials_backend_unittest_base -from telemetry.core.backends import google_credentials_backend +from telemetry.internal.backends import\ + form_based_credentials_backend_unittest_base +from telemetry.internal.backends import google_credentials_backend class TestGoogleCredentialsBackend( diff --git a/tools/telemetry/telemetry/core/backends/mandoline/__init__.py b/tools/telemetry/telemetry/internal/backends/mandoline/__init__.py index 50b23df..50b23df 100644 --- a/tools/telemetry/telemetry/core/backends/mandoline/__init__.py +++ b/tools/telemetry/telemetry/internal/backends/mandoline/__init__.py diff --git a/tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_backend.py b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_backend.py index 3747586..5cafe19 100644 --- a/tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_backend.py +++ b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_backend.py @@ -8,9 +8,9 @@ import subprocess import sys import tempfile -from telemetry.core.backends.mandoline import mandoline_browser_backend from telemetry.core import exceptions from telemetry.core import util +from telemetry.internal.backends.mandoline import mandoline_browser_backend class DesktopMandolineBackend( diff --git a/tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_finder.py b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py index deddb4c..33a2a1f 100644 --- a/tools/telemetry/telemetry/core/backends/mandoline/desktop_mandoline_finder.py +++ b/tools/telemetry/telemetry/internal/backends/mandoline/desktop_mandoline_finder.py @@ -6,12 +6,12 @@ import os import sys -from telemetry.core.backends.mandoline import desktop_mandoline_backend from telemetry.core import browser from telemetry.core import exceptions from telemetry.core import platform as platform_module from telemetry.core.platform import desktop_device from telemetry.core import possible_browser +from telemetry.internal.backends.mandoline import desktop_mandoline_backend from telemetry.internal.util import path diff --git a/tools/telemetry/telemetry/core/backends/mandoline/mandoline_browser_backend.py b/tools/telemetry/telemetry/internal/backends/mandoline/mandoline_browser_backend.py index 7715713..68455ff 100644 --- a/tools/telemetry/telemetry/core/backends/mandoline/mandoline_browser_backend.py +++ b/tools/telemetry/telemetry/internal/backends/mandoline/mandoline_browser_backend.py @@ -4,12 +4,12 @@ import re -from telemetry.core.backends import browser_backend -from telemetry.core.backends.chrome import tab_list_backend -from telemetry.core.backends.chrome_inspector import devtools_client_backend from telemetry.core import exceptions from telemetry.core import util from telemetry.core import wpr_modes +from telemetry.internal.backends import browser_backend +from telemetry.internal.backends.chrome import tab_list_backend +from telemetry.internal.backends.chrome_inspector import devtools_client_backend class MandolineBrowserBackend(browser_backend.BrowserBackend): diff --git a/tools/telemetry/telemetry/core/backends/remote/__init__.py b/tools/telemetry/telemetry/internal/backends/remote/__init__.py index 4d6aabb..4d6aabb 100644 --- a/tools/telemetry/telemetry/core/backends/remote/__init__.py +++ b/tools/telemetry/telemetry/internal/backends/remote/__init__.py diff --git a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder.py index 83f6e7b..83f6e7b 100644 --- a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py +++ b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder.py diff --git a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder_unittest.py b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py index 50cb337..5a81fb4 100644 --- a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder_unittest.py +++ b/tools/telemetry/telemetry/internal/backends/remote/trybot_browser_finder_unittest.py @@ -7,8 +7,8 @@ import logging import StringIO import unittest -from telemetry.core.backends.remote import trybot_browser_finder from telemetry.core import browser_options +from telemetry.internal.backends.remote import trybot_browser_finder from telemetry.unittest_util import simple_mock from telemetry.unittest_util import system_stub |