Rename chromium_testshell target to chrome_shell_apk.

tools/cr/cr/targets/chrome_shell.py

Index: tools/cr/cr/targets/chrome_shell.py
diff --git a/tools/cr/cr/targets/chromium_testshell.py b/tools/cr/cr/targets/chrome_shell.py
similarity index 69%
rename from tools/cr/cr/targets/chromium_testshell.py
rename to tools/cr/cr/targets/chrome_shell.py
index 0d8351be83595a73bd05245dae730650601c5586..928811ec4e53ff9b0b9d5def2b4fa557d03617e4 100644
--- a/tools/cr/cr/targets/chromium_testshell.py
+++ b/tools/cr/cr/targets/chrome_shell.py
@@ -2,27 +2,27 @@
 # 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',
   )