From efeb59e66b1e367a30746a855e3abbeb0958f90b Mon Sep 17 00:00:00 2001 From: "aurimas@chromium.org" Date: Wed, 12 Mar 2014 01:31:26 +0000 Subject: Rename chromium_testshell target to chrome_shell_apk. Final rename of ChromiumTestShell to ChromeShell. Now the new targets to build ChromeShell and ChromeShellTest APKs will be: chrome_shell_apk chrome_shell_test_apk This will better align with ContentShell and ContentShellTest APKs' targets: content_shell_apk content_shell_test_apk BUG=348137 TBR=mnaganov@chromium.org Review URL: https://codereview.chromium.org/189133005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256382 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/bisect-perf-regression.py | 2 +- tools/cr/cr/base/android.py | 2 +- tools/cr/cr/targets/chrome_shell.py | 29 ++++++++++++++++++++++ tools/cr/cr/targets/chromium_testshell.py | 29 ---------------------- ...emetry.core.chrome.android_browser_backend.html | 14 +++++------ ...lemetry.core.chrome.android_browser_finder.html | 4 +-- .../backends/chrome/android_browser_backend.py | 10 ++++---- .../core/backends/chrome/android_browser_finder.py | 4 +-- 8 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 tools/cr/cr/targets/chrome_shell.py delete mode 100644 tools/cr/cr/targets/chromium_testshell.py (limited to 'tools') diff --git a/tools/bisect-perf-regression.py b/tools/bisect-perf-regression.py index 61cc3c7..cbc56cf 100755 --- a/tools/bisect-perf-regression.py +++ b/tools/bisect-perf-regression.py @@ -671,7 +671,7 @@ class AndroidBuilder(Builder): super(AndroidBuilder, self).__init__(opts) def _GetTargets(self): - return ['chromium_testshell', 'cc_perftests_apk', 'android_tools'] + return ['chrome_shell', 'cc_perftests_apk', 'android_tools'] def Build(self, depot, opts): """Builds the android content shell and other necessary tools using options diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py index 7520613..027a697 100644 --- a/tools/cr/cr/base/android.py +++ b/tools/cr/cr/base/android.py @@ -37,7 +37,7 @@ class AndroidPlatform(cr.Platform): '{CR_SRC}', 'build', 'android', 'test_runner.py'), CR_ADB_GDB=os.path.join('{CR_SRC}', 'build', 'android', 'adb_gdb'), CHROMIUM_OUT_DIR='{CR_OUT_BASE}', - CR_DEFAULT_TARGET='chromium_testshell', + CR_DEFAULT_TARGET='chrome_shell', ) def __init__(self): diff --git a/tools/cr/cr/targets/chrome_shell.py b/tools/cr/cr/targets/chrome_shell.py new file mode 100644 index 0000000..bd326c4 --- /dev/null +++ b/tools/cr/cr/targets/chrome_shell.py @@ -0,0 +1,29 @@ +# 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. + +"""Module for the chrome_shell targets.""" + +import cr + + +class ChromeShellTarget(cr.NamedTarget): + NAME = 'chrome_shell' + DEFAULT = cr.Config.From( + # CR_URL is the page to open when the target is run. + CR_URL='https://www.google.com/', + ) + CONFIG = cr.Config.From( + CR_RUN_ARGUMENTS=cr.Config.Optional('-d "{CR_URL!e}"'), + CR_TARGET_NAME='ChromeShell', + CR_PACKAGE='org.chromium.chrome.shell', + CR_ACTIVITY='.ChromeShellActivity', + ) + + +class ChromeShellTestTarget(cr.NamedTarget): + NAME = 'chrome_shell_test' + CONFIG = cr.Config.From( + CR_TARGET_NAME='ChromiumTestShellTest', + ) + diff --git a/tools/cr/cr/targets/chromium_testshell.py b/tools/cr/cr/targets/chromium_testshell.py deleted file mode 100644 index 0d8351b..0000000 --- a/tools/cr/cr/targets/chromium_testshell.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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. - -"""Module for the chromium_testshell targets.""" - -import cr - - -class ChromiumTestShellTarget(cr.NamedTarget): - NAME = 'chromium_testshell' - DEFAULT = cr.Config.From( - # CR_URL is the page to open when the target is run. - CR_URL='https://www.google.com/', - ) - CONFIG = cr.Config.From( - CR_RUN_ARGUMENTS=cr.Config.Optional('-d "{CR_URL!e}"'), - CR_TARGET_NAME='ChromiumTestShell', - CR_PACKAGE='org.chromium.chrome.shell', - CR_ACTIVITY='.ChromeShellActivity', - ) - - -class ChromiumTestShellTestTarget(cr.NamedTarget): - NAME = 'chromium_testshell_test' - CONFIG = cr.Config.From( - CR_TARGET_NAME='ChromiumTestShellTest', - ) - diff --git a/tools/telemetry/docs/telemetry.core.chrome.android_browser_backend.html b/tools/telemetry/docs/telemetry.core.chrome.android_browser_backend.html index f1cd499..1f1fec8 100644 --- a/tools/telemetry/docs/telemetry.core.chrome.android_browser_backend.html +++ b/tools/telemetry/docs/telemetry.core.chrome.android_browser_backend.html @@ -43,7 +43,7 @@
ChromeBackendSettings -
ChromiumTestShellBackendSettings +
ChromeShellBackendSettings
ContentShellBackendSettings
WebviewBackendSettings
@@ -212,19 +212,19 @@ Data descriptors inherited from  
-class ChromiumTestShellBackendSettings(AndroidBrowserBackendSettings) +class ChromeShellBackendSettings(AndroidBrowserBackendSettings)     
Method resolution order:
-
ChromiumTestShellBackendSettings
+
ChromeShellBackendSettings
AndroidBrowserBackendSettings
__builtin__.object
Methods defined here:
-
GetDevtoolsRemotePort(self)
+
GetDevtoolsRemotePort(self)
-
__init__(self, adb, package)
+
__init__(self, adb, package)
Data descriptors defined here:
@@ -232,9 +232,9 @@ Data descriptors defined here:
Methods inherited from AndroidBrowserBackendSettings:
-
PushProfile(self, _)
+
PushProfile(self, _)
-
RemoveProfile(self)
+
RemoveProfile(self)
Data descriptors inherited from AndroidBrowserBackendSettings:
diff --git a/tools/telemetry/docs/telemetry.core.chrome.android_browser_finder.html b/tools/telemetry/docs/telemetry.core.chrome.android_browser_finder.html index 6f90c6a..6579854 100644 --- a/tools/telemetry/docs/telemetry.core.chrome.android_browser_finder.html +++ b/tools/telemetry/docs/telemetry.core.chrome.android_browser_finder.html @@ -96,7 +96,7 @@ Data descriptors inherited from         ALL_BROWSER_TYPES = 'android-chromium-testshell,android-content-shell...hrome,android-chrome-dev,android-jb-system-chrome'
CHROME_PACKAGE_NAMES = {'android-chrome': 'com.google.android.apps.chrome', 'android-chrome-beta': 'com.chrome.beta', 'android-chrome-dev': 'com.google.android.apps.chrome_dev', 'android-jb-system-chrome': 'com.android.chrome'}
-CHROMIUM_TESTSHELL_PACKAGE = 'org.chromium.chrome.shell'
+CHROME_SHELL_PACKAGE = 'org.chromium.chrome.shell'
CONTENT_SHELL_PACKAGE = 'org.chromium.content_shell_apk'
WEBVIEW_PACKAGE = 'com.android.webview.chromium.shell' - \ No newline at end of file + diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py index e1e4736..2d28d22 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py @@ -125,18 +125,18 @@ class ContentShellBackendSettings(AndroidBrowserBackendSettings): return True -class ChromiumTestShellBackendSettings(AndroidBrowserBackendSettings): +class ChromeShellBackendSettings(AndroidBrowserBackendSettings): def __init__(self, adb, package): - super(ChromiumTestShellBackendSettings, self).__init__( + super(ChromeShellBackendSettings, self).__init__( adb=adb, activity='org.chromium.chrome.shell.ChromeShellActivity', - cmdline_file='/data/local/tmp/chromium-testshell-command-line', + cmdline_file='/data/local/tmp/chrome-shell-command-line', package=package, - pseudo_exec_name='chromium_testshell', + pseudo_exec_name='chrome_shell', supports_tab_control=False) def GetDevtoolsRemotePort(self): - return 'localabstract:chromium_testshell_devtools_remote' + return 'localabstract:chrome_shell_devtools_remote' @property def is_content_shell(self): diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py index 292f485..3182357e 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py +++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py @@ -27,8 +27,8 @@ CHROME_PACKAGE_NAMES = { # TODO(tonyg): rename android-chromium-testshell to android-chrome-shell 'android-chromium-testshell': ['org.chromium.chrome.shell', - android_browser_backend.ChromiumTestShellBackendSettings, - 'ChromiumTestShell.apk'], + android_browser_backend.ChromeShellBackendSettings, + 'ChromeShell.apk'], 'android-webview': ['com.android.webview.chromium.shell', android_browser_backend.WebviewBackendSettings, -- cgit v1.1