Refactor android_webview_shell and its tests

android_webview/tools/PageCycler/AndroidManifest.xml

Index: android_webview/tools/PageCycler/AndroidManifest.xml
diff --git a/android_webview/tools/PageCycler/AndroidManifest.xml b/android_webview/tools/PageCycler/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fb5cdf5dd5721b40761bf6e4ecdf09504a6e49f
--- /dev/null
+++ b/android_webview/tools/PageCycler/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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"

[boliu, 2015/09/23 16:59:07]

.page_cycler instead of .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.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+
+    <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="android.test.InstrumentationTestRunner"
+        android:targetPackage="org.chromium.webview_shell.shell"
+        android:label="Page cycler for org.chromium.webview_shell" />
+</manifest>