Rename chromium_testshell target to chrome_shell_apk.

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

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
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 e68e396813f89c8887068eae0321690f4d01e1b7..9b867ec7f47845194e75d7b06a2c7514d32fd1ce 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
@@ -80,15 +80,14 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
                 };
         try {
             BrowserStartupController.get(this).startBrowserProcessesAsync(callback);
-        }
-        catch (ProcessInitException e) {
+        } catch (ProcessInitException e) {
             Log.e(TAG, "Unable to load native library.", e);
             System.exit(-1);
         }
     }
 
     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 = new ActivityWindowAndroid(this);
@@ -99,11 +98,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");

[nyquist, 2014/03/07 05:51:59]

Does this string have to match something else?

[aurimas (slooooooooow), 2014/03/07 18:06:09]

mnaganov@ said that it should be enough to change
chrome/browser/devtools/devtools_adb_bridge.cc

         mDevToolsServer.setRemoteDebuggingEnabled(true);
 
         mPrintingController = PrintingControllerFactory.create(this);
@@ -131,7 +130,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;
@@ -147,7 +146,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);
         }
     }
@@ -185,9 +184,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;
     }
 
@@ -195,14 +194,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) {
@@ -236,7 +235,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);
@@ -292,7 +291,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);
     }