Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/android/testshell/java/AndroidManifest.xml

Index: chrome/android/testshell/java/AndroidManifest.xml
diff --git a/content/shell/android/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml
similarity index 77%
copy from content/shell/android/java/AndroidManifest.xml
copy to chrome/android/testshell/java/AndroidManifest.xml
index 26c22b829412d2e559241b3732b2e11d731b4c56..837b1a638394a27f68c399c552d3dedb3453e3a0 100644
--- a/content/shell/android/java/AndroidManifest.xml
+++ b/chrome/android/testshell/java/AndroidManifest.xml
@@ -7,25 +7,22 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.content_shell">
+    package="org.chromium.chrome.testshell">
 
-    <permission android:name="org.chromium.content_shell.permission.SANDBOX"
+    <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX"
             android:protectionLevel="signature" />
 
-    <application android:name="ContentShellApplication"
-            android:label="ContentShell"
+    <application android:name="org.chromium.chrome.testshell.ChromiumTestShellApplication"
+            android:label="ChromiumTestShell"
             android:debuggable="true">
-        <activity android:name="ContentShellActivity"
-                  android:launchMode="singleTask"
-                  android:theme="@android:style/Theme.Holo.Light.NoActionBar"
-                  android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
+        <activity android:name="org.chromium.chrome.testshell.ChromiumTestShellActivity"
+                  android:label="ChromiumTestShellActivity"
                   android:hardwareAccelerated="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
+              <intent-filter>
+                  <action android:name="android.intent.action.MAIN" />
+                  <category android:name="android.intent.category.LAUNCHER" />
+              </intent-filter>
+         </activity>
         <!-- The following service entries exist in order to allow us to
              start more than one sandboxed process. -->
 
@@ -57,9 +54,8 @@
                  android:exported="false" />
     </application>
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 </manifest>