Add support for the ChromiumTestShellTest APK.

chrome/android/testshell/javatests/chromium_testshell_test_apk.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2012 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.
 -->
-<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">
     <fileset file="${android.gdbserver}"/>
   </path>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
   <property name="asset.absolute.dir" location="${out.dir}/assets" />
 
   <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}"/>
 
   <!-- We expect PRODUCT_DIR to be set like the gyp var
        (e.g. $ROOT/out/Debug) -->
   <fail message="PRODUCT_DIR env var not set?">
     <condition>
       <not>
         <isset property="PRODUCT_DIR"/>
       </not>
@@ skipping 11 matching lines @@
         <equals arg1="${build.target}" arg2="debug" />
       </condition>
       <then>
         <echo message="Copying gdbserver to the apk to enable native debugging"/>
         <copy todir="${out.dir}/libs/${target.abi}">
           <path refid="native.libs.gdbserver"/>
         </copy>
       </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>
 
   <!-- Classpath for javac -->
   <path id="javac.custom.classpath">
     <path refid="out.dex.jar.input.ref"/>
   </path>
   <import file="../../../../build/android/ant/sdk-targets.xml"/>
   <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>