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

41 files changed, 220 insertions, 219 deletions

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 9eadf38..f2be536 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -52,7 +52,7 @@
     {
       # android_webview_apk creates a .jar as a side effect. Any java
       # targets that need that .jar in their classpath should depend on this
-      # target. For more details see the chromium_testshell_java target.
+      # target. For more details see the chrome_shell_apk_java target.
       'target_name': 'android_webview_apk_java',
       'type': 'none',
       'dependencies': [
diff --git a/build/all.gyp b/build/all.gyp
index 7c04efde..9a07c4f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -49,7 +49,7 @@
             '<@(android_app_targets)',
             'android_builder_tests',
             '../android_webview/android_webview.gyp:android_webview_apk',
-            '../chrome/chrome.gyp:chromium_testshell',
+            '../chrome/chrome.gyp:chrome_shell_apk',
             '../remoting/remoting.gyp:remoting_apk',
             '../tools/telemetry/telemetry.gyp:*#host',
             # TODO(nyquist) This should instead by a target for sync when all of
@@ -776,8 +776,8 @@
                 '../ui/events/events.gyp:events_unittests_apk',
                 '../ui/ui_unittests.gyp:ui_unittests_apk',
                 '../android_webview/android_webview.gyp:android_webview_test_apk',
-                '../chrome/chrome.gyp:chromium_testshell_test_apk',
-                '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests',
+                '../chrome/chrome.gyp:chrome_shell_test_apk',
+                '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
                 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
               ],
             }],
diff --git a/build/android/adb_chromium_testshell_command_line b/build/android/adb_chrome_shell_command_line
index 8c09e3f..1e2bd38 100755
--- a/build/android/adb_chromium_testshell_command_line
+++ b/build/android/adb_chrome_shell_command_line
@@ -1,22 +1,22 @@
 #!/bin/bash
 #
-# Copyright (c) 2012 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.
 
-# If no flags are given, prints the current chromium test shell flags.
+# If no flags are given, prints the current chrome shell flags.
 #
-# Otherwise, the given flags are used to REPLACE (not modify) the chromium
-# test shell flags. For example:
-#   adb_chromium_testshell_command_line --enable-webgl
+# Otherwise, the given flags are used to REPLACE (not modify) the chrome shell
+# flags. For example:
+#   adb_chrome_shell_command_line --enable-webgl
 #
-# To remove all chromium test shell flags, pass an empty string for the flags:
-#   adb_chromium_testshell_command_line ""
+# To remove all chrome shell flags, pass an empty string for the flags:
+#   adb_chrome_shell_command_line ""
 
-CMD_LINE_FILE=/data/local/tmp/chromium-testshell-command-line
+CMD_LINE_FILE=/data/local/tmp/chrome-shell-command-line
 
 if [ $# -eq 0 ] ; then
-  # If nothing specified, print the command line (stripping off "chromium_testshell")
+  # If nothing specified, print the command line (stripping off "chrome_shell")
   tempfile=$(tempfile)
   adb pull $CMD_LINE_FILE $tempfile 2>/dev/null
   if [ $? -eq 0 ] ; then
@@ -30,7 +30,7 @@ elif [ $# -eq 1 ] && [ "$1" = '' ] ; then
 else
   # Else set it.
   set -x
-  adb shell "echo 'chromium_testshell $*' > $CMD_LINE_FILE"
+  adb shell "echo 'chrome_shell $*' > $CMD_LINE_FILE"
   # Prevent other apps from modifying flags -- this can create security issues.
   adb shell chmod 0664 $CMD_LINE_FILE
 fi
diff --git a/build/android/adb_gdb_chromium_testshell b/build/android/adb_gdb_chrome_shell
index 1334c9b..e5c8a30 100755
--- a/build/android/adb_gdb_chromium_testshell
+++ b/build/android/adb_gdb_chrome_shell
@@ -1,16 +1,16 @@
 #!/bin/bash
 #
-# Copyright (c) 2012 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.
 #
-# Attach to or start a ChromiumTestShell process and debug it.
+# Attach to or start a ChromeShell process and debug it.
 # See --help for details.
 #
 PROGDIR=$(dirname "$0")
 export ADB_GDB_PROGNAME=$(basename "$0")
 export ADB_GDB_ACTIVITY=.ChromeShellActivity
 "$PROGDIR"/adb_gdb \
-    --program-name=ChromiumTestShell \
+    --program-name=ChromeShell \
     --package-name=org.chromium.chrome.shell \
     "$@"
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index a93c0d7..c6e5f26 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -64,12 +64,12 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'org.chromium.content_shell_apk',
       'ContentShellTest',
       'content:content/test/data/android/device_files'),
-    I('ChromiumTestShell',
-      'ChromiumTestShell.apk',
+    I('ChromeShell',
+      'ChromeShell.apk',
       'org.chromium.chrome.shell',
-      'ChromiumTestShellTest',
+      'ChromeShellTest',
       'chrome:chrome/test/data/android/device_files',
-      constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
+      constants.CHROME_SHELL_HOST_DRIVEN_DIR),
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
@@ -156,7 +156,7 @@ def RunChromeDriverTests(options):
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s,%s' %
-          ('chromium_test_shell',
+          ('chrome_shell',
            'chrome_stable',
            'chrome_beta',
            'chromedriver_webview_shell'),
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py
index f208fb0..0d3d275 100755
--- a/build/android/buildbot/bb_run_bot.py
+++ b/build/android/buildbot/bb_run_bot.py
@@ -146,7 +146,7 @@ def GetBotStepMap():
         T(std_tests, ['--asan', '--asan-symbolize'])),
       B('blink-try-builder', H(compile_step)),
       B('chromedriver-fyi-tests-dbg', H(std_test_steps),
-        T(['chromedriver'], ['--install=ChromiumTestShell'])),
+        T(['chromedriver'], ['--install=ChromeShell'])),
       B('fyi-x86-builder-dbg',
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
@@ -165,7 +165,7 @@ def GetBotStepMap():
       # Pass empty T([]) so that logcat monitor and device status check are run.
       B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression']), T([])),
       B('perf-tests-rel', H(std_test_steps),
-        T([], ['--install=ChromiumTestShell'])),
+        T([], ['--install=ChromeShell'])),
       B('webkit-latest-webkit-tests', H(std_test_steps),
         T(['webkit_layout', 'webkit'], ['--auto-reconnect'])),
       B('webkit-latest-contentshell', H(compile_step),
diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
index 49383e5..a6b3f57 100644
--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
@@ -62,9 +62,9 @@ Still reading?
     <ignore path="AndroidManifest.xml"/>
   </issue>
   <issue id="NewApi">
-    <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest$6.class"/>
-    <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest$7.class"/>
-    <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest.class"/>
+    <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest$6.class"/>
+    <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest$7.class"/>
+    <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest.class"/>
     <ignore path="PRODUCT_DIR/content_shell_test_apk/classes/org/chromium/content/browser/ClipboardTest.class"/>
     <ignore path="android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java"/>
     <ignore path="android_webview/java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java"/>
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index 4e22892..53dba7b 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -15,7 +15,7 @@ DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                                os.pardir, os.pardir, os.pardir))
 ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')
 
-CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
+CHROME_SHELL_HOST_DRIVEN_DIR = os.path.join(
     DIR_SOURCE_ROOT, 'chrome', 'android')
 
 
@@ -60,11 +60,11 @@ PACKAGE_INFO = {
         '/data/local/tmp/content-shell-command-line',
         None,
         'org.chromium.content_shell_apk.tests'),
-    'chromium_test_shell': PackageInfo(
+    'chrome_shell': PackageInfo(
         'org.chromium.chrome.shell',
         'org.chromium.chrome.shell.ChromeShellActivity',
-        '/data/local/tmp/chromium-testshell-command-line',
-        'chromium_testshell_devtools_remote',
+        '/data/local/tmp/chrome-shell-command-line',
+        'chrome_shell_devtools_remote',
         'org.chromium.chrome.shell.tests'),
     'android_webview_shell': PackageInfo(
         'org.chromium.android_webview.shell',
diff --git a/build/android/pylib/utils/report_results.py b/build/android/pylib/utils/report_results.py
index 9b98cb4..cb8115f 100644
--- a/build/android/pylib/utils/report_results.py
+++ b/build/android/pylib/utils/report_results.py
@@ -47,7 +47,7 @@ def _LogToFlakinessDashboard(results, test_type, test_package,
   try:
     if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
       assert test_package in ['ContentShellTest',
-                              'ChromiumTestShellTest',
+                                'ChromeShellTest',
                               'AndroidWebViewTest']
       dashboard_test_type = ('%s_instrumentation_tests' %
                              test_package.lower().rstrip('test'))
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 2221e45..335f166 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -210,7 +210,7 @@ def AddInstrumentationTestOptions(option_parser):
   option_parser.usage = '%prog instrumentation [options]'
   option_parser.commands_dict = {}
   option_parser.example = ('%prog instrumentation '
-                           '--test-apk=ChromiumTestShellTest')
+                           '--test-apk=ChromeShellTest')
 
   AddJavaTestOptions(option_parser)
   AddCommonOptions(option_parser)
@@ -296,8 +296,8 @@ def AddUIAutomatorTestOptions(option_parser):
   option_parser.usage = '%prog uiautomator [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
-      '%prog uiautomator --test-jar=chromium_testshell_uiautomator_tests'
-      ' --package=chromium_test_shell')
+      '%prog uiautomator --test-jar=chrome_shell_uiautomator_tests'
+      ' --package=chrome_shell')
   option_parser.add_option(
       '--package',
       help=('Package under test. Possible values: %s' %
@@ -368,7 +368,7 @@ def AddMonkeyTestOptions(option_parser):
   option_parser.usage = '%prog monkey [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
-      '%prog monkey --package=chromium_test_shell')
+      '%prog monkey --package=chrome_shell')
 
   option_parser.add_option(
       '--package',
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
index 6e557fa..eb87760 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
@@ -9,8 +9,8 @@ import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.EnormousTest;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.shell.ChromeShellTab;
 import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.chrome.shell.TestShellTab;
 import org.chromium.chrome.test.util.TabUtils;
 import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException;
  */
 public class RepostFormWarningTest extends ChromeShellTestBase {
     // Active tab.
-    private TestShellTab mTab;
+    private ChromeShellTab mTab;
     // Callback helper that manages waiting for pageloads to finish.
     private TestCallbackHelperContainer mCallbackHelper;
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java
index 8d730ce..6c643a7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java
@@ -17,8 +17,8 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.printing.TabPrinter;
+import org.chromium.chrome.shell.ChromeShellTab;
 import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.chrome.shell.TestShellTab;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -77,7 +77,7 @@ public class PrintingControllerTest extends ChromeShellTestBase {
     public void testNormalPrintingFlow() throws Throwable {
         if (!ApiCompatibilityUtils.isPrintingSupported()) return;
 
-        final TestShellTab currentTab = launchChromeShellWithUrl(URL).getActiveTab();
+        final ChromeShellTab currentTab = launchChromeShellWithUrl(URL).getActiveTab();
         assertTrue(waitForActiveShellToBeDoneLoading());
 
         final PrintingControllerImpl printingController = createControllerOnUiThread();
@@ -162,7 +162,7 @@ public class PrintingControllerTest extends ChromeShellTestBase {
     }
 
     private void startControllerOnUiThread(final PrintingControllerImpl controller,
-            final TestShellTab tab) {
+            final ChromeShellTab tab) {
         try {
             final PrintManagerDelegate mockPrintManagerDelegate = new PrintManagerDelegate() {
                 @Override
diff --git a/chrome/android/shell/chrome_main_delegate_testshell_android.cc b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc
index c0b11d9..d836bdd 100644
--- a/chrome/android/shell/chrome_main_delegate_testshell_android.cc
+++ b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/android/shell/chrome_main_delegate_testshell_android.h"
+#include "chrome/android/shell/chrome_main_delegate_chrome_shell_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
@@ -11,16 +11,17 @@
 static const char kDefaultCountryCode[] = "US";
 
 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {
-  return new ChromeMainDelegateTestShellAndroid();
+  return new ChromeMainDelegateChromeShellAndroid();
 }
 
-ChromeMainDelegateTestShellAndroid::ChromeMainDelegateTestShellAndroid() {
+ChromeMainDelegateChromeShellAndroid::ChromeMainDelegateChromeShellAndroid() {
 }
 
-ChromeMainDelegateTestShellAndroid::~ChromeMainDelegateTestShellAndroid() {
+ChromeMainDelegateChromeShellAndroid::~ChromeMainDelegateChromeShellAndroid() {
 }
 
-bool ChromeMainDelegateTestShellAndroid::BasicStartupComplete(int* exit_code) {
+bool ChromeMainDelegateChromeShellAndroid::BasicStartupComplete(
+    int* exit_code) {
   TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode);
   return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);
 }
diff --git a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h
new file mode 100644
index 0000000..36e2413
--- /dev/null
+++ b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h
@@ -0,0 +1,21 @@
+// 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.
+
+#ifndef CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_CHROME_SHELL_ANDROID_H_
+#define CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_CHROME_SHELL_ANDROID_H_
+
+#include "chrome/app/android/chrome_main_delegate_android.h"
+
+class ChromeMainDelegateChromeShellAndroid : public ChromeMainDelegateAndroid {
+ public:
+  ChromeMainDelegateChromeShellAndroid();
+  virtual ~ChromeMainDelegateChromeShellAndroid();
+
+  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeShellAndroid);
+};
+
+#endif  // CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_CHROME_SHELL_ANDROID_H_
diff --git a/chrome/android/shell/chrome_main_delegate_testshell_android.h b/chrome/android/shell/chrome_main_delegate_testshell_android.h
deleted file mode 100644
index 1e98606..0000000
--- a/chrome/android/shell/chrome_main_delegate_testshell_android.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.
-
-#ifndef CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-#define CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-
-#include "chrome/app/android/chrome_main_delegate_android.h"
-
-class ChromeMainDelegateTestShellAndroid : public ChromeMainDelegateAndroid {
- public:
-  ChromeMainDelegateTestShellAndroid();
-  virtual ~ChromeMainDelegateTestShellAndroid();
-
-  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateTestShellAndroid);
-};
-
-#endif  // CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
diff --git a/chrome/android/shell/chrome_shell_google_location_settings_helper.cc b/chrome/android/shell/chrome_shell_google_location_settings_helper.cc
new file mode 100644
index 0000000..41aa232
--- /dev/null
+++ b/chrome/android/shell/chrome_shell_google_location_settings_helper.cc
@@ -0,0 +1,40 @@
+// 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.
+
+#include "chrome/android/shell/chrome_shell_google_location_settings_helper.h"
+
+// Factory function
+GoogleLocationSettingsHelper* GoogleLocationSettingsHelper::Create() {
+  return new ChromeShellGoogleLocationSettingsHelper();
+}
+
+ChromeShellGoogleLocationSettingsHelper::
+    ChromeShellGoogleLocationSettingsHelper()
+    : GoogleLocationSettingsHelper() {
+}
+
+ChromeShellGoogleLocationSettingsHelper::
+    ~ChromeShellGoogleLocationSettingsHelper() {
+}
+
+std::string ChromeShellGoogleLocationSettingsHelper::GetAcceptButtonLabel(
+    bool allow) {
+  return "Allow";
+}
+
+void ChromeShellGoogleLocationSettingsHelper::ShowGoogleLocationSettings() {
+}
+
+bool ChromeShellGoogleLocationSettingsHelper::
+    IsGoogleAppsLocationSettingEnabled() {
+  return true;
+}
+
+bool ChromeShellGoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
+  return true;
+}
+
+bool ChromeShellGoogleLocationSettingsHelper::IsAllowLabel() {
+  return true;
+}
diff --git a/chrome/android/shell/testshell_google_location_settings_helper.h b/chrome/android/shell/chrome_shell_google_location_settings_helper.h
index cbb0afe..a4fd2c9 100644
--- a/chrome/android/shell/testshell_google_location_settings_helper.h
+++ b/chrome/android/shell/chrome_shell_google_location_settings_helper.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
-#define CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#ifndef CHROME_ANDROID_SHELL_CHROME_SHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#define CHROME_ANDROID_SHELL_CHROME_SHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 
 #include "chrome/browser/android/google_location_settings_helper.h"
 
 // Stub implementation of GoogleLocationSettingsHelper for testshell.
-class TestShellGoogleLocationSettingsHelper
+class ChromeShellGoogleLocationSettingsHelper
     : public GoogleLocationSettingsHelper {
  public:
   // GoogleLocationSettingsHelper implementation:
@@ -19,13 +19,13 @@ class TestShellGoogleLocationSettingsHelper
   virtual bool IsAllowLabel() OVERRIDE;
 
  protected:
-  TestShellGoogleLocationSettingsHelper();
-  virtual ~TestShellGoogleLocationSettingsHelper();
+  ChromeShellGoogleLocationSettingsHelper();
+  virtual ~ChromeShellGoogleLocationSettingsHelper();
 
  private:
   friend class GoogleLocationSettingsHelper;
 
-  DISALLOW_COPY_AND_ASSIGN(TestShellGoogleLocationSettingsHelper);
+  DISALLOW_COPY_AND_ASSIGN(ChromeShellGoogleLocationSettingsHelper);
 };
 
-#endif  // CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#endif  // CHROME_ANDROID_SHELL_CHROME_SHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index b31617b..ab0c269 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -105,7 +105,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
     }
 
     private void finishInitialization(final Bundle savedInstanceState) {
-        setContentView(R.layout.testshell_activity);
+        setContentView(R.layout.chrome_shell_activity);
         mTabManager = (TabManager) findViewById(R.id.tab_manager);
 
         mWindow = sWindowAndroidFactory.getActivityWindowAndroid(this);
@@ -116,11 +116,11 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
         if (!TextUtils.isEmpty(startupUrl)) {
             mTabManager.setStartupUrl(startupUrl);
         }
-        TestShellToolbar mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
+        ChromeShellToolbar mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar);
         mAppMenuHandler = new AppMenuHandler(this, this, R.menu.main_menu);
         mToolbar.setMenuHandler(mAppMenuHandler);
 
-        mDevToolsServer = new DevToolsServer("chromium_testshell");
+        mDevToolsServer = new DevToolsServer("chrome_shell");
         mDevToolsServer.setRemoteDebuggingEnabled(true);
 
         mPrintingController = PrintingControllerFactory.create(this);
@@ -148,7 +148,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            TestShellTab tab = getActiveTab();
+            ChromeShellTab tab = getActiveTab();
             if (tab != null && tab.getContentView().canGoBack()) {
                 tab.getContentView().goBack();
                 return true;
@@ -164,7 +164,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
 
         String url = getUrlFromIntent(intent);
         if (!TextUtils.isEmpty(url)) {
-            TestShellTab tab = getActiveTab();
+            ChromeShellTab tab = getActiveTab();
             if (tab != null) tab.loadUrlWithSanitization(url);
         }
     }
@@ -202,9 +202,9 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
     }
 
     /**
-     * @return The {@link TestShellTab} that is currently visible.
+     * @return The {@link ChromeShellTab} that is currently visible.
      */
-    public TestShellTab getActiveTab() {
+    public ChromeShellTab getActiveTab() {
         return mTabManager != null ? mTabManager.getCurrentTab() : null;
     }
 
@@ -212,14 +212,14 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
      * @return The ContentView of the active tab.
      */
     public ContentView getActiveContentView() {
-        TestShellTab tab = getActiveTab();
+        ChromeShellTab tab = getActiveTab();
         return tab != null ? tab.getContentView() : null;
     }
 
     /**
-     * Creates a {@link TestShellTab} with a URL specified by {@code url}.
+     * Creates a {@link ChromeShellTab} with a URL specified by {@code url}.
      *
-     * @param url The URL the new {@link TestShellTab} should start with.
+     * @param url The URL the new {@link ChromeShellTab} should start with.
      */
     @VisibleForTesting
     public void createTab(String url) {
@@ -254,7 +254,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
                 }
                 return true;
             case R.id.distill_page:
-                TestShellTab activeTab = getActiveTab();
+                ChromeShellTab activeTab = getActiveTab();
                 String viewUrl = DomDistillerUrlUtils.getDistillerViewUrlFromUrl(
                         CHROME_DISTILLER_SCHEME, getActiveTab().getUrl());
                 activeTab.loadUrlWithSanitization(viewUrl);
@@ -310,7 +310,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
         menu.findItem(R.id.print).setVisible(ApiCompatibilityUtils.isPrintingSupported());
 
         menu.findItem(R.id.distill_page).setVisible(
-                CommandLine.getInstance().hasSwitch(TestShellSwitches.ENABLE_DOM_DISTILLER));
+                CommandLine.getInstance().hasSwitch(ChromeShellSwitches.ENABLE_DOM_DISTILLER));
 
         menu.setGroupVisible(R.id.MAIN_MENU, true);
     }
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
index f3d30bc3..fe48d05 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
  * loading the right resources.
  */
 public class ChromeShellApplication extends ChromiumApplication {
-    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshell";
+    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromeshell";
     /**
      * icudtl.dat provides ICU (i18n library) with all the necessary data
      * for its operation. We used to link the data statically to our binary,
@@ -34,8 +34,7 @@ public class ChromeShellApplication extends ChromiumApplication {
         "chrome_100_percent.pak",
         "icudtl.dat",
     };
-    private static final String COMMAND_LINE_FILE =
-            "/data/local/tmp/chromium-testshell-command-line";
+    private static final String COMMAND_LINE_FILE = "/data/local/tmp/chrome-shell-command-line";
 
     ArrayList<ChromeShellApplicationObserver> mObservers;
 
@@ -61,9 +60,7 @@ public class ChromeShellApplication extends ChromiumApplication {
             shouldFire &= observer.onSendBroadcast(intent);
         }
 
-        if (shouldFire) {
-            super.sendBroadcast(intent);
-        }
+        if (shouldFire) super.sendBroadcast(intent);
     }
 
     public void addObserver(ChromeShellApplicationObserver observer) {
@@ -99,6 +96,6 @@ public class ChromeShellApplication extends ChromiumApplication {
 
     @Override
     protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
-        return new TestShellPKCS11AuthenticationManager();
+        return new ChromeShellPKCS11AuthenticationManager();
     }
 }
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellPKCS11AuthenticationManager.java
index bd77503..6a8ae55 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellPKCS11AuthenticationManager.java
@@ -14,7 +14,7 @@ import java.security.cert.X509Certificate;
 /**
  * ChromeShell stub implementation of PKCS11AuthenticationManager.
  */
-public class TestShellPKCS11AuthenticationManager implements PKCS11AuthenticationManager {
+public class ChromeShellPKCS11AuthenticationManager implements PKCS11AuthenticationManager {
     @Override
     public boolean isPKCS11AuthEnabled() {
         return false;
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellSwitches.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellSwitches.java
index 809661a..b6b87a4 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellSwitches.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellSwitches.java
@@ -7,7 +7,7 @@ package org.chromium.chrome.shell;
 /**
  * Command line switches for the shell.
  */
-public abstract class TestShellSwitches {
+public abstract class ChromeShellSwitches {
     // Enable the DOM Distiller.
     public static final String ENABLE_DOM_DISTILLER = "enable-dom-distiller";
 }
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellTab.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
index 1464ed6..71aabe0 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellTab.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
@@ -19,10 +19,10 @@ import org.chromium.content_public.Referrer;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
- * TestShell's implementation of a tab. This mirrors how Chrome for Android subclasses
+ * ChromeShell's implementation of a tab. This mirrors how Chrome for Android subclasses
  * and extends {@link Tab}.
  */
-public class TestShellTab extends Tab {
+public class ChromeShellTab extends Tab {
     // Tab state
     private boolean mIsLoading;
 
@@ -32,7 +32,7 @@ public class TestShellTab extends Tab {
      * @param window            The WindowAndroid should represent this tab.
      * @param contentViewClient The client for the {@link ContentView}s of this Tab.
      */
-    public TestShellTab(Context context, String url, WindowAndroid window,
+    public ChromeShellTab(Context context, String url, WindowAndroid window,
             ContentViewClient contentViewClient) {
         super(false, context, window);
         initialize();
@@ -84,7 +84,7 @@ public class TestShellTab extends Tab {
 
     @Override
     protected TabChromeWebContentsDelegateAndroid createWebContentsDelegate() {
-        return new TestShellTabChromeWebContentsDelegateAndroid();
+        return new ChromeShellTabChromeWebContentsDelegateAndroid();
     }
 
     @Override
@@ -109,7 +109,7 @@ public class TestShellTab extends Tab {
         });
     }
 
-    private class TestShellTabChromeWebContentsDelegateAndroid
+    private class ChromeShellTabChromeWebContentsDelegateAndroid
             extends TabChromeWebContentsDelegateAndroid {
         @Override
         public void onLoadStarted() {
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
index 6c79b16..48b91fd 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellToolbar.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.appmenu.AppMenuHandler;
 /**
  * A Toolbar {@link View} that shows the URL and navigation buttons.
  */
-public class TestShellToolbar extends LinearLayout {
+public class ChromeShellToolbar extends LinearLayout {
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
@@ -40,7 +40,7 @@ public class TestShellToolbar extends LinearLayout {
     private EditText mUrlTextView;
     private ClipDrawable mProgressDrawable;
 
-    private TestShellTab mTab;
+    private ChromeShellTab mTab;
     private final TabObserver mTabObserver = new TabObserverImpl();
 
     private AppMenuHandler mMenuHandler;
@@ -50,7 +50,7 @@ public class TestShellToolbar extends LinearLayout {
      * @param context The Context the view is running in.
      * @param attrs   The attributes of the XML tag that is inflating the view.
      */
-    public TestShellToolbar(Context context, AttributeSet attrs) {
+    public ChromeShellToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
@@ -58,7 +58,7 @@ public class TestShellToolbar extends LinearLayout {
      * The toolbar will visually represent the state of {@code tab}.
      * @param tab The Tab that should be represented.
      */
-    public void showTab(TestShellTab tab) {
+    public void showTab(ChromeShellTab tab) {
         if (mTab != null) mTab.removeObserver(mTabObserver);
         mTab = tab;
         mTab.addObserver(mTabObserver);
@@ -84,7 +84,7 @@ public class TestShellToolbar extends LinearLayout {
         initializeMenuButton();
     }
 
-    public void setMenuHandler(AppMenuHandler menuHandler) {
+    void setMenuHandler(AppMenuHandler menuHandler) {
         mMenuHandler = menuHandler;
         ImageButton menuButton = (ImageButton) findViewById(R.id.menu_button);
         mAppMenuButtonHelper = new AppMenuButtonHelper(menuButton, mMenuHandler);
@@ -148,12 +148,12 @@ public class TestShellToolbar extends LinearLayout {
     private class TabObserverImpl extends EmptyTabObserver {
         @Override
         public void onLoadProgressChanged(Tab tab, int progress) {
-            if (tab == mTab) TestShellToolbar.this.onLoadProgressChanged(progress);
+            if (tab == mTab) ChromeShellToolbar.this.onLoadProgressChanged(progress);
         }
 
         @Override
         public void onUpdateUrl(Tab tab, String url) {
-            if (tab == mTab) TestShellToolbar.this.onUpdateUrl(url);
+            if (tab == mTab) ChromeShellToolbar.this.onUpdateUrl(url);
         }
     }
 }
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
index 9f4adc3..3a2d294 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
@@ -18,8 +18,8 @@ import org.chromium.ui.base.WindowAndroid;
 
 /**
  * The TabManager hooks together all of the related {@link View}s that are used to represent
- * a {@link TestShellTab}.  It properly builds a {@link TestShellTab} and makes sure that the
- * {@link TestShellToolbar} and {@link ContentViewRenderView} show the proper content.
+ * a {@link ChromeShellTab}.  It properly builds a {@link ChromeShellTab} and makes sure that the
+ * {@link ChromeShellToolbar} and {@link ContentViewRenderView} show the proper content.
  */
 public class TabManager extends LinearLayout {
     private static final String DEFAULT_URL = "http://www.google.com";
@@ -28,9 +28,9 @@ public class TabManager extends LinearLayout {
     private ContentVideoViewClient mContentVideoViewClient;
     private ViewGroup mContentViewHolder;
     private ContentViewRenderView mContentViewRenderView;
-    private TestShellToolbar mToolbar;
+    private ChromeShellToolbar mToolbar;
 
-    private TestShellTab mCurrentTab;
+    private ChromeShellTab mCurrentTab;
 
     private String mStartupUrl = DEFAULT_URL;
 
@@ -58,7 +58,7 @@ public class TabManager extends LinearLayout {
         assert videoViewClient != null;
         mContentVideoViewClient = videoViewClient;
         mContentViewHolder = (ViewGroup) findViewById(R.id.content_container);
-        mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
+        mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar);
         mContentViewRenderView = new ContentViewRenderView(getContext(), mWindow) {
             @Override
             protected void onReadyToRender() {
@@ -79,15 +79,15 @@ public class TabManager extends LinearLayout {
     }
 
     /**
-     * @return The currently visible {@link TestShellTab}.
+     * @return The currently visible {@link ChromeShellTab}.
      */
-    public TestShellTab getCurrentTab() {
+    public ChromeShellTab getCurrentTab() {
         return mCurrentTab;
     }
 
     /**
-     * Creates a {@link TestShellTab} with a URL specified by {@code url}.
-     * @param url The URL the new {@link TestShellTab} should start with.
+     * Creates a {@link ChromeShellTab} with a URL specified by {@code url}.
+     * @param url The URL the new {@link ChromeShellTab} should start with.
      */
     public void createTab(String url) {
         if (!isContentViewRenderViewInitialized()) return;
@@ -98,7 +98,7 @@ public class TabManager extends LinearLayout {
                 return mContentVideoViewClient;
             }
         };
-        TestShellTab tab = new TestShellTab(getContext(), url, mWindow, client);
+        ChromeShellTab tab = new ChromeShellTab(getContext(), url, mWindow, client);
         setCurrentTab(tab);
     }
 
@@ -106,7 +106,7 @@ public class TabManager extends LinearLayout {
         return mContentViewRenderView != null && mContentViewRenderView.isInitialized();
     }
 
-    private void setCurrentTab(TestShellTab tab) {
+    private void setCurrentTab(ChromeShellTab tab) {
         if (mCurrentTab != null) {
             mContentViewHolder.removeView(mCurrentTab.getContentView());
             mCurrentTab.destroy();
diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
index 2630d97..44f02a3 100644
--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
@@ -40,7 +40,7 @@ public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<Chrome
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                CommandLine.initFromFile("/data/local/tmp/chromium-testshell-command-line");
+                CommandLine.initFromFile("/data/local/tmp/chrome-shell-command-line");
                 try {
                     BrowserStartupController.get(targetContext).startBrowserProcessesSync(
                             BrowserStartupController.MAX_RENDERERS_LIMIT);
@@ -93,7 +93,7 @@ public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<Chrome
                     runTestOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            TestShellTab tab = activity.getActiveTab();
+                            ChromeShellTab tab = activity.getActiveTab();
                             if (tab != null) {
                                 isLoaded.set(!tab.isLoading()
                                         && !TextUtils.isEmpty(tab.getContentView().getUrl()));
@@ -112,7 +112,7 @@ public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<Chrome
     }
 
     /**
-     * Clear all files and folders in the Chromium testshell's application directory except 'lib'.
+     * Clear all files and folders in the ChromeShell's application directory except 'lib'.
      *
      * The 'cache' directory is recreated as an empty directory.
      *
diff --git a/chrome/android/shell/res/layout/testshell_activity.xml b/chrome/android/shell/res/layout/chrome_shell_activity.xml
index 0800a75..f9d37b7 100644
--- a/chrome/android/shell/res/layout/testshell_activity.xml
+++ b/chrome/android/shell/res/layout/chrome_shell_activity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- Copyright 2012 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.
@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <org.chromium.chrome.shell.TestShellToolbar android:id="@+id/toolbar"
+    <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -35,7 +35,7 @@
             android:src="@drawable/menu_dots"
             android:background="?android:attr/selectableItemBackground"
             android:scaleType="center" />
-    </org.chromium.chrome.shell.TestShellToolbar>
+    </org.chromium.chrome.shell.ChromeShellToolbar>
     <FrameLayout android:id="@+id/content_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/chrome/android/shell/testshell_google_location_settings_helper.cc b/chrome/android/shell/testshell_google_location_settings_helper.cc
deleted file mode 100644
index 8dd4ace..0000000
--- a/chrome/android/shell/testshell_google_location_settings_helper.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.
-
-#include "chrome/android/shell/testshell_google_location_settings_helper.h"
-
-// Factory function
-GoogleLocationSettingsHelper* GoogleLocationSettingsHelper::Create() {
-  return new TestShellGoogleLocationSettingsHelper();
-}
-
-TestShellGoogleLocationSettingsHelper::TestShellGoogleLocationSettingsHelper()
-    : GoogleLocationSettingsHelper() {
-}
-
-TestShellGoogleLocationSettingsHelper::
-    ~TestShellGoogleLocationSettingsHelper() {
-}
-
-std::string TestShellGoogleLocationSettingsHelper::GetAcceptButtonLabel(
-    bool allow) {
-  return "Allow";
-}
-
-void TestShellGoogleLocationSettingsHelper::ShowGoogleLocationSettings() {
-}
-
-bool TestShellGoogleLocationSettingsHelper::
-    IsGoogleAppsLocationSettingEnabled() {
-  return true;
-}
-
-bool TestShellGoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
-  return true;
-}
-
-bool TestShellGoogleLocationSettingsHelper::IsAllowLabel() {
-  return true;
-}
diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc
index 7140b8d..824d07e 100644
--- a/chrome/browser/devtools/devtools_adb_bridge.cc
+++ b/chrome/browser/devtools/devtools_adb_bridge.cc
@@ -114,7 +114,7 @@ const BrowserDescriptor kBrowserDescriptors[] = {
   },
   {
     "org.chromium.chrome.shell",
-    "chromium_testshell_devtools_remote",
+    "chrome_shell_devtools_remote",
     "Chrome Shell"
   },
   {
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 9afe7dd..1109343 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -4,14 +4,14 @@
 {
   'variables': {
     'chromium_code': 1,
-    'package_name': 'chromium_testshell',
+    'package_name': 'chrome_shell_apk',
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
   'targets': [
     {
-      'target_name': 'libchromiumtestshell',
+      'target_name': 'libchromeshell',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -23,10 +23,10 @@
         # This file must always be included in the shared_library step to ensure
         # JNI_OnLoad is exported.
         'app/android/chrome_jni_onload.cc',
-        'android/shell/chrome_main_delegate_testshell_android.cc',
-        'android/shell/chrome_main_delegate_testshell_android.h',
-        "android/shell/testshell_google_location_settings_helper.cc",
-        "android/shell/testshell_google_location_settings_helper.h",
+        'android/shell/chrome_main_delegate_chrome_shell_android.cc',
+        'android/shell/chrome_main_delegate_chrome_shell_android.h',
+        "android/shell/chrome_shell_google_location_settings_helper.cc",
+        "android/shell/chrome_shell_google_location_settings_helper.h",
       ],
       'include_dirs': [
         '../skia/config',
@@ -46,21 +46,21 @@
       ],
     },
     {
-      'target_name': 'chromium_testshell',
+      'target_name': 'chrome_shell_apk',
       'type': 'none',
       'dependencies': [
         'chrome_java',
-        'chromium_testshell_paks',
-        'libchromiumtestshell',
+        'chrome_shell_paks',
+        'libchromeshell',
         '../media/media.gyp:media_java',
       ],
       'variables': {
-        'apk_name': 'ChromiumTestShell',
+        'apk_name': 'ChromeShell',
         'manifest_package_name': 'org.chromium.chrome.shell',
         'java_in_dir': 'android/shell/java',
         'resource_dir': 'android/shell/res',
         'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
-        'native_lib_target': 'libchromiumtestshell',
+        'native_lib_target': 'libchromeshell',
         'native_lib_version_name': '<(version_full)',
         'additional_input_paths': [
           '<@(chrome_android_pak_output_resources)',
@@ -69,14 +69,16 @@
       'includes': [ '../build/java_apk.gypi', ],
     },
     {
-      # chromium_testshell creates a .jar as a side effect. Any java targets
+      # chrome_shell_apk creates a .jar as a side effect. Any java targets
       # that need that .jar in their classpath should depend on this target,
-      # chromium_testshell_java. Dependents of chromium_testshell receive its
+      # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its
       # jar path in the variable 'apk_output_jar_path'.
-      'target_name': 'chromium_testshell_java',
+      # This target should only be used by targets which instrument
+      # chrome_shell_apk.
+      'target_name': 'chrome_shell_apk_java',
       'type': 'none',
       'dependencies': [
-        'chromium_testshell',
+        'chrome_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
@@ -112,7 +114,7 @@
       },
     },
     {
-      'target_name': 'chromium_testshell_paks',
+      'target_name': 'chrome_shell_paks',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7d5bde0..6f210dd 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2971,11 +2971,11 @@
     ['OS == "android"', {
       'targets': [
         {
-          'target_name': 'chromium_testshell_test_apk',
+          'target_name': 'chrome_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'chrome_java',
-            'chromium_testshell_java',
+            'chrome_shell_apk_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
@@ -2983,7 +2983,7 @@
             '../sync/sync.gyp:sync_javatests',
           ],
           'variables': {
-            'apk_name': 'ChromiumTestShellTest',
+            'apk_name': 'ChromeShellTest',
             'java_in_dir': 'android/shell/javatests',
             'resource_dir': 'android/shell/res',
             'additional_src_dirs': ['android/javatests/src'],
@@ -3002,7 +3002,7 @@
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
-          'target_name': 'chromium_testshell_uiautomator_tests_java',
+          'target_name': 'chrome_shell_uiautomator_tests_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'android/uiautomator_tests',
@@ -3014,10 +3014,10 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
-          'target_name': 'chromium_testshell_uiautomator_tests',
+          'target_name': 'chrome_shell_uiautomator_tests',
           'type': 'none',
           'dependencies': [
-            'chromium_testshell_uiautomator_tests_java',
+            'chrome_shell_uiautomator_tests_java',
           ],
           'includes': [ '../build/uiautomator_test.gypi' ],
         },
diff --git a/chrome/test/chromedriver/chrome/device_manager.cc b/chrome/test/chromedriver/chrome/device_manager.cc
index 6493231..8bedee4 100644
--- a/chrome/test/chromedriver/chrome/device_manager.cc
+++ b/chrome/test/chromedriver/chrome/device_manager.cc
@@ -58,9 +58,9 @@ Status Device::SetUp(const std::string& package,
   } else if (package.compare("org.chromium.chrome.shell") == 0) {
     // ChromeShell
     known_activity = ".ChromeShellActivity";
-    device_socket = "chromium_testshell_devtools_remote";
-    command_line_file = "/data/local/tmp/chromium-testshell-command-line";
-    exec_name = "chromium_testshell";
+    device_socket = "chrome_shell_devtools_remote";
+    command_line_file = "/data/local/tmp/chrome-shell-command-line";
+    exec_name = "chrome_shell";
   } else if (package.find("chrome") != std::string::npos &&
              package.find("webview") == std::string::npos) {
     // Chrome.
diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py
index 111fea6..48083b2 100755
--- a/chrome/test/chromedriver/test/run_py_tests.py
+++ b/chrome/test/chromedriver/test/run_py_tests.py
@@ -121,16 +121,16 @@ _ANDROID_NEGATIVE_FILTER['chrome_stable'] = (
     _ANDROID_NEGATIVE_FILTER['chrome'])
 _ANDROID_NEGATIVE_FILTER['chrome_beta'] = (
     _ANDROID_NEGATIVE_FILTER['chrome'])
-_ANDROID_NEGATIVE_FILTER['chromium_test_shell'] = (
+_ANDROID_NEGATIVE_FILTER['chrome_shell'] = (
     _ANDROID_NEGATIVE_FILTER['chrome'] + [
-        # ChromiumTestShell doesn't support multiple tabs.
+        # ChromeShell doesn't support multiple tabs.
         'ChromeDriverTest.testGetWindowHandles',
         'ChromeDriverTest.testSwitchToWindow',
         'ChromeDriverTest.testShouldHandleNewWindowLoadingProperly',
     ]
 )
 _ANDROID_NEGATIVE_FILTER['chromedriver_webview_shell'] = (
-    _ANDROID_NEGATIVE_FILTER['chromium_test_shell'])
+    _ANDROID_NEGATIVE_FILTER['chrome_shell'])
 
 
 class ChromeDriverBaseTest(unittest.TestCase):
diff --git a/chrome/test/chromedriver/test/test_expectations b/chrome/test/chromedriver/test/test_expectations
index 8c05db0..1e2803f 100644
--- a/chrome/test/chromedriver/test/test_expectations
+++ b/chrome/test/chromedriver/test/test_expectations
@@ -185,7 +185,7 @@ _OS_NEGATIVE_FILTER['android:chrome_stable'] = (
     _OS_NEGATIVE_FILTER['android:chrome'])
 _OS_NEGATIVE_FILTER['android:chrome_beta'] = (
     _OS_NEGATIVE_FILTER['android:chrome'])
-_OS_NEGATIVE_FILTER['android:chromium_test_shell'] = (
+_OS_NEGATIVE_FILTER['android:chrome_shell'] = (
     _OS_NEGATIVE_FILTER['android:chrome'])
 _OS_NEGATIVE_FILTER['android:chromedriver_webview_shell'] = (
     _OS_NEGATIVE_FILTER['android:chrome'] + [
diff --git a/chrome/tools/build/android/FILES.cfg b/chrome/tools/build/android/FILES.cfg
index 1295546..eb32634 100644
--- a/chrome/tools/build/android/FILES.cfg
+++ b/chrome/tools/build/android/FILES.cfg
@@ -32,7 +32,7 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'apks/ChromiumTestShell.apk',
+    'filename': 'apks/ChromeShell.apk',
     'buildtype': ['dev', 'official'],
   },
 ]
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,