Rename chromium_testshell target to chrome_shell_apk.

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
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 fb8d5967b9ddce50ce38b756f83b43f2b7011ff0..852e39859501b2b3ec289d4604806cdcae266c3d 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,14 +21,13 @@ 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";
     private static final String[] CHROME_MANDATORY_PAKS = {
         "en-US.pak",
         "resources.pak",
         "chrome_100_percent.pak",
     };
-    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;
 
@@ -54,9 +53,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) {
@@ -68,8 +65,7 @@ public class ChromeShellApplication extends ChromiumApplication {
     }
 
     public static void initCommandLine() {
-        if (!CommandLine.isInitialized())
-            CommandLine.initFromFile(COMMAND_LINE_FILE);
+        if (!CommandLine.isInitialized()) CommandLine.initFromFile(COMMAND_LINE_FILE);
     }
 
     @Override
@@ -91,6 +87,6 @@ public class ChromeShellApplication extends ChromiumApplication {
 
     @Override
     protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
-        return new TestShellPKCS11AuthenticationManager();
+        return new ChromeShellPKCS11AuthenticationManager();
     }
 }