Add support for the ChromiumTestShellTest APK.

chrome/android/testshell/javatests/chromium_testshell_test_apk.xml

Index: chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
similarity index 80%
copy from content/shell/android/javatests/content_shell_test_apk.xml
copy to chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
index 6d5f6824d93546546cdd95a46c6530ee81d14b41..b4fc4b335eada913e014662940b45cdddfc08877 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
@@ -4,16 +4,16 @@
   Use of this source code is governed by a BSD-style license that can be
   found in the LICENSE file.
 -->
-<project name="ContentShellTest" default="debug" basedir=".">
+<project name="ChromiumTestShellTest" default="debug" basedir=".">
 
   <description>
-    Building ContentShellTest.apk
+    Building ChromiumTestShellTest.apk
   </description>
 
   <import file="../../../../build/android/ant/common.xml"/>
 
   <property name="target.abi" value="${APP_ABI}"/>
-  <property name="out.dir" location="${PRODUCT_DIR}/content_shell_test"/>
+  <property name="out.dir" location="${PRODUCT_DIR}/chromium_testshell_test"/>
   <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <path id="native.libs.gdbserver">
@@ -24,7 +24,7 @@
 
   <path id="out.dex.jar.input.ref">
     <filelist files="${INPUT_JARS_PATHS}"/>
-    <pathelement location="${PRODUCT_DIR}/content_shell/classes"/>
+    <pathelement location="${PRODUCT_DIR}/chromium_testshell/classes"/>
   </path>
   <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
 
@@ -56,16 +56,10 @@
       </then>
     </if>
 
-    <!-- We also want a .jar as well as an .apk for ContentShellTest-debug
+    <!-- We also want a .jar as well as an .apk for ChromiumTestShellTest-debug
          so that proguard can be used to list the tests by annotation. -->
     <jar destfile="${out.dir}/${ant.project.name}-debug.jar">
       <fileset dir="${out.dir}/classes" includes="**/*.class"/>
-      <zipfileset
-         includes="**/*.class"
-         src="${PRODUCT_DIR}/lib.java/chromium_content_javatests.jar"/>
-      <zipfileset
-         includes="**/*.class"
-         src="${PRODUCT_DIR}/lib.java/chromium_net_javatests.jar"/>
     </jar>
 
   </target>