Refactor android_webview_shell and its tests

android_webview/tools/WebViewShell/AndroidManifest.xml

Index: android_webview/tools/WebViewShell/AndroidManifest.xml
diff --git a/android_webview/tools/WebViewShell/AndroidManifest.xml b/android_webview/tools/WebViewShell/AndroidManifest.xml
deleted file mode 100644
index a7a79e5e354f8ab8dd00756129e063c214dec3fe..0000000000000000000000000000000000000000
--- a/android_webview/tools/WebViewShell/AndroidManifest.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
- * 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"
-    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:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.Light" >
-        <activity
-            android:name=".TelemetryActivity"
-            android:label="@string/title_activity_telemetry"
-            android:exported="true">
-        </activity>
-        <activity
-            android:name=".TelemetryMemoryPressureActivity"
-            android:launchMode="singleTask"
-            android:label="@string/title_activity_telemetry"
-            android:exported="true">
-        </activity>
-        <activity
-            android:name=".JankActivity"
-            android:label="@string/title_activity_jank"
-            android:noHistory="true"
-            android:exported="true">
-        </activity>
-        <activity
-            android:name=".StartupTimeActivity"
-            android:label="@string/title_activity_startup_time"
-            android:noHistory="true"
-            android:exported="true">
-        </activity>
-        <activity
-            android:name=".WebViewBrowserActivity"
-            android:label="@string/title_activity_browser"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <!-- Catch intents which do not specify a MIME type -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-            </intent-filter>
-            <!-- Catch intents which do specify a MIME type -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:mimeType="text/html"/>
-                <data android:mimeType="text/plain"/>
-                <data android:mimeType="application/xhtml+xml"/>
-                <data android:mimeType="application/vnd.wap.xhtml+xml"/> <!-- XHTML MP -->
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".WebViewLayoutTestActivity"
-            android:label="@string/title_activity_layout_test"
-            android:exported="true">
-        </activity>
-
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="org.chromium.webview_shell.WebViewLayoutTestRunner"
-        android:targetPackage="org.chromium.webview_shell"
-        android:label="Tests for org.chromium.webview_shell" />
-</manifest>