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

7 files changed, 25 insertions, 25 deletions

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/chromium_testshell.py b/tools/cr/cr/targets/chrome_shell.py
index 0d8351b..bd326c4 100644
--- a/tools/cr/cr/targets/chromium_testshell.py
+++ b/tools/cr/cr/targets/chrome_shell.py
@@ -1,28 +1,28 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Module for the chromium_testshell targets."""
+"""Module for the chrome_shell targets."""
 
 import cr
 
 
-class ChromiumTestShellTarget(cr.NamedTarget):
-  NAME = 'chromium_testshell'
+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='ChromiumTestShell',
+      CR_TARGET_NAME='ChromeShell',
       CR_PACKAGE='org.chromium.chrome.shell',
       CR_ACTIVITY='.ChromeShellActivity',
   )
 
 
-class ChromiumTestShellTestTarget(cr.NamedTarget):
-  NAME = 'chromium_testshell_test'
+class ChromeShellTestTarget(cr.NamedTarget):
+  NAME = 'chrome_shell_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 @@
 </font></dt><dd>
 <dl>
 <dt><font face="helvetica, arial"><a href="telemetry.core.chrome.android_browser_backend.html#ChromeBackendSettings">ChromeBackendSettings</a>
-</font></dt><dt><font face="helvetica, arial"><a href="telemetry.core.chrome.android_browser_backend.html#ChromiumTestShellBackendSettings">ChromiumTestShellBackendSettings</a>
+</font></dt><dt><font face="helvetica, arial"><a href="telemetry.core.chrome.android_browser_backend.html#ChromeShellBackendSettings">ChromeShellBackendSettings</a>
 </font></dt><dt><font face="helvetica, arial"><a href="telemetry.core.chrome.android_browser_backend.html#ContentShellBackendSettings">ContentShellBackendSettings</a>
 </font></dt><dt><font face="helvetica, arial"><a href="telemetry.core.chrome.android_browser_backend.html#WebviewBackendSettings">WebviewBackendSettings</a>
 </font></dt></dl>
@@ -212,19 +212,19 @@ Data descriptors inherited from <a href="telemetry.core.chrome.android_browser_b
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#ffc8d8">
 <td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="ChromiumTestShellBackendSettings">class <strong>ChromiumTestShellBackendSettings</strong></a>(<a href="telemetry.core.chrome.android_browser_backend.html#AndroidBrowserBackendSettings">AndroidBrowserBackendSettings</a>)</font></td></tr>
+<font color="#000000" face="helvetica, arial"><a name="ChromeShellBackendSettings">class <strong>ChromeShellBackendSettings</strong></a>(<a href="telemetry.core.chrome.android_browser_backend.html#AndroidBrowserBackendSettings">AndroidBrowserBackendSettings</a>)</font></td></tr>
     
 <tr><td bgcolor="#ffc8d8"><tt>&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><dl><dt>Method resolution order:</dt>
-<dd><a href="telemetry.core.chrome.android_browser_backend.html#ChromiumTestShellBackendSettings">ChromiumTestShellBackendSettings</a></dd>
+<dd><a href="telemetry.core.chrome.android_browser_backend.html#ChromeShellBackendSettings">ChromeShellBackendSettings</a></dd>
 <dd><a href="telemetry.core.chrome.android_browser_backend.html#AndroidBrowserBackendSettings">AndroidBrowserBackendSettings</a></dd>
 <dd><a href="__builtin__.html#object">__builtin__.object</a></dd>
 </dl>
 <hr>
 Methods defined here:<br>
-<dl><dt><a name="ChromiumTestShellBackendSettings-GetDevtoolsRemotePort"><strong>GetDevtoolsRemotePort</strong></a>(self)</dt></dl>
+<dl><dt><a name="ChromeShellBackendSettings-GetDevtoolsRemotePort"><strong>GetDevtoolsRemotePort</strong></a>(self)</dt></dl>
 
-<dl><dt><a name="ChromiumTestShellBackendSettings-__init__"><strong>__init__</strong></a>(self, adb, package)</dt></dl>
+<dl><dt><a name="ChromeShellBackendSettings-__init__"><strong>__init__</strong></a>(self, adb, package)</dt></dl>
 
 <hr>
 Data descriptors defined here:<br>
@@ -232,9 +232,9 @@ Data descriptors defined here:<br>
 </dl>
 <hr>
 Methods inherited from <a href="telemetry.core.chrome.android_browser_backend.html#AndroidBrowserBackendSettings">AndroidBrowserBackendSettings</a>:<br>
-<dl><dt><a name="ChromiumTestShellBackendSettings-PushProfile"><strong>PushProfile</strong></a>(self, _)</dt></dl>
+<dl><dt><a name="ChromeShellBackendSettings-PushProfile"><strong>PushProfile</strong></a>(self, _)</dt></dl>
 
-<dl><dt><a name="ChromiumTestShellBackendSettings-RemoveProfile"><strong>RemoveProfile</strong></a>(self)</dt></dl>
+<dl><dt><a name="ChromeShellBackendSettings-RemoveProfile"><strong>RemoveProfile</strong></a>(self)</dt></dl>
 
 <hr>
 Data descriptors inherited from <a href="telemetry.core.chrome.android_browser_backend.html#AndroidBrowserBackendSettings">AndroidBrowserBackendSettings</a>:<br>
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 <a href="telemetry.core.possible_browser.html#Po
 <tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><strong>ALL_BROWSER_TYPES</strong> = 'android-chromium-testshell,android-content-shell...hrome,android-chrome-dev,android-jb-system-chrome'<br>
 <strong>CHROME_PACKAGE_NAMES</strong> = {'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'}<br>
-<strong>CHROMIUM_TESTSHELL_PACKAGE</strong> = 'org.chromium.chrome.shell'<br>
+<strong>CHROME_SHELL_PACKAGE</strong> = 'org.chromium.chrome.shell'<br>
 <strong>CONTENT_SHELL_PACKAGE</strong> = 'org.chromium.content_shell_apk'<br>
 <strong>WEBVIEW_PACKAGE</strong> = 'com.android.webview.chromium.shell'</td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>
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,