Refactor android_webview_shell and its tests

android_webview/tools/WebViewShellTest/AndroidManifest.xml

Index: android_webview/tools/WebViewShellTest/AndroidManifest.xml
diff --git a/android_webview/tools/WebViewShellTest/AndroidManifest.xml b/android_webview/tools/WebViewShellTest/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..00ebd4c59cee64f53b09480894fab9d888daeadc
--- /dev/null
+++ b/android_webview/tools/WebViewShellTest/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright 2015 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.
+-->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.chromium.webview_shell.test"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <application android:hardwareAccelerated="false">
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker"
+            android:exported="true"/>
+    </application>
+
+    <instrumentation android:name="org.chromium.webview_shell.test.WebViewLayoutTestRunner"
+        android:targetPackage="org.chromium.webview_shell"
+        android:label="Layout tests for org.chromium.webview_shell" />
+</manifest>