Rename to ChromiumTestShell package from testshell to shell

chrome/test/chromedriver/chrome/device_manager.cc

 // Copyright (c) 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.
 
 #include "chrome/test/chromedriver/chrome/device_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 37 matching lines @@
   std::string known_activity;
   std::string command_line_file;
   std::string device_socket;
   std::string exec_name;
   if (package.compare("org.chromium.content_shell_apk") == 0) {
     // Chromium content shell.
     known_activity = ".ContentShellActivity";
     device_socket = "content_shell_devtools_remote";
     command_line_file = "/data/local/tmp/content-shell-command-line";
     exec_name = "content_shell";
-  } else if (package.compare("org.chromium.chrome.testshell") == 0) {
+  } else if (package.compare("org.chromium.chrome.shell") == 0) {
     // Chromium test shell.
     known_activity = ".ChromiumTestShellActivity";
     device_socket = "chromium_testshell_devtools_remote";
     command_line_file = "/data/local/tmp/chromium-testshell-command-line";
     exec_name = "chromium_testshell";
   } else if (package.find("chrome") != std::string::npos &&
              package.find("webview") == std::string::npos) {
     // Chrome.
     known_activity = "com.google.android.apps.chrome.Main";
     device_socket = "chrome_devtools_remote";
@@ skipping 144 matching lines @@
   return new Device(device_serial, adb_,
       base::Bind(&DeviceManager::ReleaseDevice, base::Unretained(this),
                  device_serial));
 }
 
 bool DeviceManager::IsDeviceLocked(const std::string& device_serial) {
   return std::find(active_devices_.begin(), active_devices_.end(),
                    device_serial) != active_devices_.end();
 }