diff options
| author | yolandyan <yolandyan@google.com> | 2015-10-19 18:06:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 01:07:25 +0000 |
| commit | d3825fe7fbfe780da6967c026248842d9f39b11d (patch) | |
| tree | cb21596df8fb316cad9ba455e1967d75aaf2f8eb /android_webview/tools/PageCycler | |
| parent | 100888961b73a5b51b50db7d614ed0ec117d0c5f (diff) | |
| download | chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.zip chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.tar.gz chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.tar.bz2 | |
Move WebViewLayoutTestRunner.java to WebViewShellTestRunner.java to
allow both layout tests and page cycler to use this test runner
This is to solve the conflict in the following 2 CLs
https://codereview.chromium.org/1402833002
https://codereview.chromium.org/1410023002
Review URL: https://codereview.chromium.org/1413663006
Cr-Commit-Position: refs/heads/master@{#354944}
Diffstat (limited to 'android_webview/tools/PageCycler')
| -rw-r--r-- | android_webview/tools/PageCycler/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/tools/PageCycler/AndroidManifest.xml b/android_webview/tools/PageCycler/AndroidManifest.xml index 49fb1e3..f96b90c 100644 --- a/android_webview/tools/PageCycler/AndroidManifest.xml +++ b/android_webview/tools/PageCycler/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="true"/> </application> - <instrumentation android:name="org.chromium.base.test.BaseInstrumentationTestRunner" + <instrumentation android:name="org.chromium.webview_shell.WebViewShellTestRunner" android:targetPackage="org.chromium.webview_shell" android:label="Page cycler for org.chromium.webview_shell" /> </manifest> |