Add support for the ChromiumTestShellTest APK.

chrome/android/testshell/javatests/AndroidManifest.xml

Index: chrome/android/testshell/javatests/AndroidManifest.xml
diff --git a/android_webview/javatests/AndroidManifest.xml b/chrome/android/testshell/javatests/AndroidManifest.xml
similarity index 76%
copy from android_webview/javatests/AndroidManifest.xml
copy to chrome/android/testshell/javatests/AndroidManifest.xml
index 5b494c92956518bd8ab6c7dfddf5c6af51c58267..89ae9e696f41ee9b5e17fd4de12e2cd26ee2fc39 100644
--- a/android_webview/javatests/AndroidManifest.xml
+++ b/chrome/android/testshell/javatests/AndroidManifest.xml
@@ -2,20 +2,20 @@
   <!-- 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. -->
+  <!-- package name must be unique so suffix with "tests" so package loader
+       doesn't ignore this. -->
   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.chromium.android_webview.test">
+      package="org.chromium.chrome.testshell.tests">
     <!-- We add an application tag here just so that we can indicate that this
          package needs to link against the android.test library, which is
          needed when building test cases. -->
     <application>
         <uses-library android:name="android.test.runner" />
-        <provider android:name="TestContentProvider"
-            android:authorities="org.chromium.android_webview.test.TestContentProvider" />
     </application>
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" />
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="org.chromium.android_webview"
-        android:label="Tests for org.chromium.android_webview"/>
+        android:targetPackage="org.chromium.chrome.testshell"
+        android:label="Tests for org.chromium.chrome.testshell"/>
     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
     <uses-permission android:name="android.permission.INJECT_EVENTS" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />