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 64%
copy from content/shell/android/javatests/content_shell_test_apk.xml
copy to chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
index 8f8ee1d4fd31b1696259b78701495bab823bb436..a44dd661aba7b0f2ddde1de23583a0fbf5f3e612 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
@@ -4,19 +4,19 @@
   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-value name="target.abi" value="${APP_ABI}"/>
-  <property-location name="out.dir" location="${PRODUCT_DIR}/content_shell_test"
+  <property name="target.abi" value="${APP_ABI}"/>
+  <property-location name="out.dir" location="${PRODUCT_DIR}/chromium_testshell_test"
       check-exists="false"/>
   <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
-  <property-value name="gen.absolute.dir" value="${out.dir}/gen"/>
+  <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property-location name="native.libs.absolute.dir" location="${out.dir}/libs"
       check-exists="false"/>
   <property-location name="asset.absolute.dir" location="${out.dir}/assets"
@@ -27,12 +27,16 @@
       check-exists="false"/>
   <property name="generate.test.jar" value="true"/>
 
-  <property-location name="contentshell.classes.dir"
-      location="${PRODUCT_DIR}/content_shell/classes"/>
+  <property-location name="chromium_testshell.classes.dir"
+      location="${PRODUCT_DIR}/chromium_testshell/classes"/>
 
   <path id="out.dex.jar.input.ref">
     <filelist files="${INPUT_JARS_PATHS}"/>
-    <pathelement location="${contentshell.classes.dir}"/>
+    <pathelement location="${chromium_testshell.classes.dir}"/>
+  </path>
+
+  <path id="javac.custom.sourcepath">
+    <pathelement location="../../javatests/src" />
   </path>
 
   <!-- Classpath for javac -->
@@ -41,5 +45,5 @@
   </path>
 
   <import file="../../../../build/android/ant/sdk-targets.xml"/>
-  <import file="${sdk.dir}/tools/ant/build.xml"/>
+  <import file="${sdk.dir}/tools/ant/build.xml" />
 </project>