Refactor android_webview_shell and its tests

android_webview/tools/system_webview_shell/apk/AndroidManifest.xml

Index: android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
diff --git a/android_webview/tools/WebViewShell/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
similarity index 82%
rename from android_webview/tools/WebViewShell/AndroidManifest.xml
rename to android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
index a7a79e5e354f8ab8dd00756129e063c214dec3fe..da5e6c04a6b8d8203b5b3164ff52498610a67c21 100644
--- a/android_webview/tools/WebViewShell/AndroidManifest.xml
+++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.webview_shell"
+    package="org.chromium.webview_shell.shell"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -28,30 +28,30 @@
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Light" >
         <activity
-            android:name=".TelemetryActivity"
+            android:name="org.chromium.webview_shell.shell.TelemetryActivity"
             android:label="@string/title_activity_telemetry"
             android:exported="true">
         </activity>
         <activity
-            android:name=".TelemetryMemoryPressureActivity"
+            android:name="org.chromium.webview_shell.shell.TelemetryMemoryPressureActivity"
             android:launchMode="singleTask"
             android:label="@string/title_activity_telemetry"
             android:exported="true">
         </activity>
         <activity
-            android:name=".JankActivity"
+            android:name="org.chromium.webview_shell.shell.JankActivity"
             android:label="@string/title_activity_jank"
             android:noHistory="true"
             android:exported="true">
         </activity>
         <activity
-            android:name=".StartupTimeActivity"
+            android:name="org.chromium.webview_shell.shell.StartupTimeActivity"
             android:label="@string/title_activity_startup_time"
             android:noHistory="true"
             android:exported="true">
         </activity>
         <activity
-            android:name=".WebViewBrowserActivity"
+            android:name="org.chromium.webview_shell.shell.WebViewBrowserActivity"
             android:label="@string/title_activity_browser"
             android:exported="true">
             <intent-filter>
@@ -80,15 +80,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".WebViewLayoutTestActivity"
+            android:name="org.chromium.webview_shell.shell.WebViewLayoutTestActivity"
             android:label="@string/title_activity_layout_test"
             android:exported="true">
         </activity>
-
-        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name="org.chromium.webview_shell.shell.PageCyclerTestActivity"
+            android:label="@string/title_activity_page_cycler"
+            android:exported="true">
+        </activity>
     </application>
-
-    <instrumentation android:name="org.chromium.webview_shell.WebViewLayoutTestRunner"
-        android:targetPackage="org.chromium.webview_shell"
-        android:label="Tests for org.chromium.webview_shell" />
 </manifest>